minor fixes to michels patches

Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/inittab.c b/inittab.c
index 7f76a1e..0d62708 100644 (file)
--- a/inittab.c
+++ b/inittab.c
@@ -85,7 +85,7 @@ static int dev_exist(const char *dev)
        if (res != -1) {
                close(res);
        }
        if (res != -1) {
                close(res);
        }

-       
+

        return (res != -1);
 }
 
        return (res != -1);
 }
 


@@ -172,10 +172,10 @@ static void askconsole(struct init_action *a)
        int i;
 
        tty = get_cmdline_val("console", line, sizeof(line));
        int i;
 
        tty = get_cmdline_val("console", line, sizeof(line));

-       split=strchr(tty, ',');
-       if (split != NULL)
-               split = '\0';
-       
+       split = strchr(tty, ',');
+       if (split)
+               *split = '\0';
+

        if (!dev_exist(tty)) {
                DEBUG(4, "skipping %s\n", tty);
                return;
        if (!dev_exist(tty)) {
                DEBUG(4, "skipping %s\n", tty);
                return;

diff --git a/utils/utils.c b/utils/utils.c
index 5e67310..a8c2a91 100644 (file)
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -149,16 +149,16 @@ char* get_cmdline_val(const char* name, char* out, int len)
        close(fd);
 
        sprintf( pattern, "%s=([^ \n]*)", name);
        close(fd);
 
        sprintf( pattern, "%s=([^ \n]*)", name);

-    regcomp(&pat_cmdline, pattern, REG_EXTENDED);
-    if (!regexec(&pat_cmdline, line, 2, matches, 0)) {
-       line[matches[1].rm_eo] = '\0';
+       regcomp(&pat_cmdline, pattern, REG_EXTENDED);
+       if (!regexec(&pat_cmdline, line, 2, matches, 0)) {
+               line[matches[1].rm_eo] = '\0';

                tty = (line + matches[1].rm_so);
                strncpy(out, tty, len);
                tty[len-1] = '\0';
                res = out;
        }
 
                tty = (line + matches[1].rm_so);
                strncpy(out, tty, len);
                tty[len-1] = '\0';
                res = out;
        }
 

-    regfree(&pat_cmdline);
+       regfree(&pat_cmdline);

 
        return res;
 }
 
        return res;
 }