Taught conf_parse_line() to ignore spaces in the

 '[section]' parsing and before the assignment statements

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
index c5f9fa7fb2a75852ee8a7f858a8b19813b435575..5f491eb7c8a5de6de270a86b5c70cef08d642383 100644 (file)
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -50,11 +50,6 @@
 #include "xlog.h"
 
 static void conf_load_defaults (int);
 #include "xlog.h"
 
 static void conf_load_defaults (int);

-#if 0
-static int conf_find_trans_xf (int, char *);
-#endif
-
-size_t  strlcpy(char *, const char *, size_t);

 
 struct conf_trans {
        TAILQ_ENTRY (conf_trans) link;
 
 struct conf_trans {
        TAILQ_ENTRY (conf_trans) link;


@@ -219,26 +214,48 @@ conf_parse_line(int trans, char *line, size_t sz)
        if (*line == '#' || *line == ';')
                return;
 
        if (*line == '#' || *line == ';')
                return;
 

+       /* Ignore blank lines */
+       if (*line == '\0')
+               return;
+
+       /* Strip off any leading blanks */
+       while (isblank(*line)) 
+               line++;
+

        /* '[section]' parsing...  */
        if (*line == '[') {
        /* '[section]' parsing...  */
        if (*line == '[') {

-               for (i = 1; i < sz; i++)
-                       if (line[i] == ']')
+               line++;
+               /* Strip off any blanks after '[' */
+               while (isblank(*line)) 
+                       line++;
+
+               for (i = 0; i < sz; i++) {
+                       if (line[i] == ']') {

                                break;
                                break;

+                       }
+               }

                if (section)
                if (section)

-                       free (section);
+                       free(section);

                if (i == sz) {
                        xlog_warn("conf_parse_line: %d:"
                                "non-matched ']', ignoring until next section", ln);
                        section = 0;
                        return;
                }
                if (i == sz) {
                        xlog_warn("conf_parse_line: %d:"
                                "non-matched ']', ignoring until next section", ln);
                        section = 0;
                        return;
                }

+               /* Strip off any blanks before ']' */
+               val = line;
+               while (*val && !isblank(*val)) 
+                       val++, j++;
+               if (*val)
+                       i = j;
+

                section = malloc(i);
                if (!section) {
                        xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln,
                                                (unsigned long)i);
                        return;
                }
                section = malloc(i);
                if (!section) {
                        xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln,
                                                (unsigned long)i);
                        return;
                }

-               strlcpy(section, line + 1, i);
+               strncpy(section, line, i);

                return;
        }
 
                return;
        }