daemon: cleanup: factor out xstrdup_tolower()

Add xstrdup_tolower(), a helper to get a lower case copy of a
string, and use it in two cases.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/daemon.c b/daemon.c
index 4468fb9d3513a7071f904717e89e09887f6dbde1..60bf6c743c559676f0c9e0ff8dc6d9a5dfede195 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -397,6 +397,14 @@ static void make_service_overridable(const char *name, int ena)
        die("No such service %s", name);
 }
 
        die("No such service %s", name);
 }
 

+static char *xstrdup_tolower(const char *str)
+{
+       char *p, *dup = xstrdup(str);
+       for (p = dup; *p; p++)
+               *p = tolower(*p);
+       return dup;
+}
+

 /*
  * Separate the "extra args" information as supplied by the client connection.
  */
 /*
  * Separate the "extra args" information as supplied by the client connection.
  */


@@ -405,7 +413,6 @@ static void parse_extra_args(char *extra_args, int buflen)
        char *val;
        int vallen;
        char *end = extra_args + buflen;
        char *val;
        int vallen;
        char *end = extra_args + buflen;

-       char *hp;

 
        while (extra_args < end && *extra_args) {
                saw_extended_args = 1;
 
        while (extra_args < end && *extra_args) {
                saw_extended_args = 1;


@@ -423,7 +430,7 @@ static void parse_extra_args(char *extra_args, int buflen)
                                        tcp_port = xstrdup(port);
                                }
                                free(hostname);
                                        tcp_port = xstrdup(port);
                                }
                                free(hostname);

-                               hostname = xstrdup(host);
+                               hostname = xstrdup_tolower(host);

                        }
 
                        /* On to the next one */
                        }
 
                        /* On to the next one */


@@ -431,20 +438,11 @@ static void parse_extra_args(char *extra_args, int buflen)
                }
        }
 
                }
        }
 

-       /*
-        * Replace literal host with lowercase-ized hostname.
-        */
-       hp = hostname;
-       if (!hp)
-               return;
-       for ( ; *hp; hp++)
-               *hp = tolower(*hp);
-

        /*
         * Locate canonical hostname and its IP address.
         */
        /*
         * Locate canonical hostname and its IP address.
         */

+       if (hostname) {

 #ifndef NO_IPV6
 #ifndef NO_IPV6

-       {

                struct addrinfo hints;
                struct addrinfo *ai, *ai0;
                int gai;
                struct addrinfo hints;
                struct addrinfo *ai, *ai0;
                int gai;


@@ -468,9 +466,7 @@ static void parse_extra_args(char *extra_args, int buflen)
                        }
                        freeaddrinfo(ai0);
                }
                        }
                        freeaddrinfo(ai0);
                }

-       }

 #else
 #else

-       {

                struct hostent *hent;
                struct sockaddr_in sa;
                char **ap;
                struct hostent *hent;
                struct sockaddr_in sa;
                char **ap;


@@ -491,8 +487,8 @@ static void parse_extra_args(char *extra_args, int buflen)
                canon_hostname = xstrdup(hent->h_name);
                free(ip_address);
                ip_address = xstrdup(addrbuf);
                canon_hostname = xstrdup(hent->h_name);
                free(ip_address);
                ip_address = xstrdup(addrbuf);

-       }

 #endif
 #endif

+       }

 }
 
 
 }
 
 


@@ -945,12 +941,8 @@ int main(int argc, char **argv)
                char *arg = argv[i];
 
                if (!prefixcmp(arg, "--listen=")) {
                char *arg = argv[i];
 
                if (!prefixcmp(arg, "--listen=")) {

-                   char *p = arg + 9;
-                   char *ph = listen_addr = xmalloc(strlen(arg + 9) + 1);
-                   while (*p)
-                       *ph++ = tolower(*p++);
-                   *ph = 0;
-                   continue;
+                       listen_addr = xstrdup_tolower(arg + 9);
+                       continue;

                }
                if (!prefixcmp(arg, "--port=")) {
                        char *end;
                }
                if (!prefixcmp(arg, "--port=")) {
                        char *end;