getdata-commits Mailing List for GetData (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 796
          http://sourceforge.net/p/getdata/code/796
Author:   ketiltrout
Date:     2013-02-19 00:14:17 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Sections in config files.

Modified Paths:
--------------
    trunk/defile/bin/defile.c
    trunk/defile/bin/rc.c

Modified: trunk/defile/bin/defile.c
===================================================================

--- trunk/defile/bin/defile.c	2013-02-15 03:13:09 UTC (rev 795)
+++ trunk/defile/bin/defile.c	2013-02-19 00:14:17 UTC (rev 796)
@@ -2419,8 +2419,8 @@
   struct df_rc_data rcd = {
     .contact = DEFILE_CONTACT,
     .copyright = DEFILE_COPYRIGHT,
+    .local_config = "${HOME}/.defilerc",
     .global_config = "defilerc",
-    .local_config = "${HOME}/.defilerc",
     .flags = DF_RC_FLAG_NMSB,
     .licence = 0,
     .name = NULL,
@@ -2581,6 +2581,8 @@
     /* parse input options */
     memset(&rcd, 0, sizeof(rcd));
     rcd.contact = df->input_framework->contact;
+    rcd.global_config = "defilerc";
+    rcd.local_config = "${HOME}/.defilerc";
     rcd.copyright = df->input_framework->copyright;
     rcd.flags = 0;
     rcd.licence = df->input_framework->licence;

Modified: trunk/defile/bin/rc.c
===================================================================
--- trunk/defile/bin/rc.c	2013-02-15 03:13:09 UTC (rev 795)
+++ trunk/defile/bin/rc.c	2013-02-19 00:14:17 UTC (rev 796)
@@ -85,9 +85,6 @@
 #define logprintf(...)
 #endif
 
-#define DF_OPT_WIDTH 28
-#define DF_TTY_WIDTH 80
-
 /* Word expand a string as if in a shell */
 char *df_rc_shell_expand(int fac, const char *argument)
 {
@@ -140,6 +137,8 @@
   return ptr;
 }
 
+#define DF_OPT_WIDTH 28
+#define DF_TTY_WIDTH 80
 static void DF_OptUsage(const struct df_optdef *opt, char shift_char)
 {
   const char *u;
@@ -438,6 +437,14 @@
   }
 }
 
+/* strcmp with NULLs */
+static int strnullcmp(const char *s1, const char *s2)
+{
+  if (s1 == NULL)
+    return (s2 == NULL) ? 0 : -1;
+  return (s2 == NULL) ? 1 : strcmp(s1, s2);
+}
+
 static void DF_PushConfig(int i, const char* val, int error, int no_dup,
     const char* cwd, const char* label, int line, int sopt,
     struct df_rc_data *rcd)
@@ -502,7 +509,7 @@
   char cwd[4096];
   char *opt, *val;
   int i, found, ln = 0;
-  char* file;
+  char *file, *section = NULL;
 
   const int fac = (rcd->name == NULL) ? DF_PRN_INPUT : DF_PRN_DF;
 
@@ -555,43 +562,81 @@
     while (opt >= buffer && (*opt == ' ' || *opt == '\t' || *opt == '\0'))
       *(opt--) = '\0';
 
-    /* strip leading whitespace */
-    opt = buffer + strspn(buffer, " \t");
-    if ((val = strchr(opt, ' ')) != NULL) {
-      *(val++) = '\0';
-      val += strspn(val, " \t");
-    }
-
     /* skip empty lines */
     if (!*buffer)
       continue;
 
-    logprintf("    Found directive `%s' with argument `%s' on line %i\n", opt,
-        val, ln);
+    /* strip leading whitespace */
+    opt = buffer + strspn(buffer, " \t");
 
-    /* Include */
-    if (strcasecmp(opt, "Include") == 0) {
-      DF_DoRunControl(val, cwd, rcd);
-      continue;
-    }
+    /* check for a section header */
+    if (*opt == '[') {
+      /* find the trailing ] */
+      if ((val = strchr(++opt, ']')) != NULL)
+        *val = 0;
 
-    /* match directive */
-    found = 0;
-    for (i = 0; rcd->options[i].type != DF_OPT_END_OO; ++i)
-      if (strcasecmp(opt, rcd->options[i].directive) == 0) {
-        DF_PushConfig(i, val, DF_RC_ERR_OK, 0, cwd, label, ln, 0, rcd);
-        found = 1;
+      if (val == NULL || *opt == '\0') {
+        /* invalid section header */
+        logprintf("      Ignoring bad header `%s'\n", opt);
+        continue;
+      }
+
+      logprintf("    Found section [%s] on line %i\n", opt, ln);
+
+      /* if we're handling the top section, there's no point in continuing: we can
+       * never get back there */
+      if (rcd->name == NULL)
         break;
+
+      *val = 0;
+      free(section);
+      section = strdup(opt);
+      if (section == NULL) {
+        DF_OOM(DF_PRN_DF);
+        exit(1);
       }
+    } else {
+      /* find the argument */
+      if ((val = strchr(opt, ' ')) != NULL) {
+        *(val++) = '\0';
+        val += strspn(val, " \t");
+      }
 
-    if (!found) {
-      logprintf("      Unknown option `%s'\n", opt);
-      DF_PushConfig(DF_RC_NO_MATCH, opt, DF_RC_ERR_OK, 0, cwd, label, ln,
-          0, rcd);
+      logprintf("    Found directive `%s' with argument `%s' on line %i in "
+          "section [%s]\n", opt, val, ln, section ? section : "[top]");
+
+      /* Include -- we only do this if we're either in the top section or else
+       * in the correct one */
+      if (strcasecmp(opt, "Include") == 0 && (section == NULL || (rcd->name &&
+            strcmp(section, rcd->name) == 0)))
+      {
+        DF_DoRunControl(val, cwd, rcd);
+        continue;
+      }
+
+      /* don't do anything else if we're not in the right section */
+      if (strnullcmp(section, rcd->name))
+        continue;
+
+      /* match directive */
+      found = 0;
+      for (i = 0; rcd->options[i].type != DF_OPT_END_OO; ++i)
+        if (strcasecmp(opt, rcd->options[i].directive) == 0) {
+          DF_PushConfig(i, val, DF_RC_ERR_OK, 0, cwd, label, ln, 0, rcd);
+          found = 1;
+          break;
+        }
+
+      if (!found) {
+        logprintf("      Unknown option `%s'\n", opt);
+        DF_PushConfig(DF_RC_NO_MATCH, opt, DF_RC_ERR_OK, 0, cwd, label, ln,
+            0, rcd);
+      }
     }
   }
 
   fclose(stream);
+  free(section);
   free(file);
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (5)	Oct (20)	Nov (21)	Dec (16)
2011	Jan (1)	Feb (1)	Mar (56)	Apr (20)	May (4)	Jun (2)	Jul (3)	Aug (11)	Sep (2)	Oct (4)	Nov (18)	Dec (16)
2012	Jan (8)	Feb (12)	Mar (30)	Apr (13)	May (10)	Jun (17)	Jul (18)	Aug (19)	Sep	Oct (1)	Nov (1)	Dec (9)
2013	Jan (1)	Feb (4)	Mar (27)	Apr (6)	May (3)	Jun (1)	Jul (10)	Aug	Sep (3)	Oct (15)	Nov (4)	Dec (9)
2014	Jan	Feb (3)	Mar (4)	Apr (10)	May (15)	Jun	Jul (14)	Aug	Sep (2)	Oct (6)	Nov	Dec (9)
2015	Jan (2)	Feb (3)	Mar (1)	Apr (2)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

getdata-commits Mailing List for GetData (Page 7)

Scientific Database Format

getdata-commits — An automated log of GetData Subversion activity.