DistRen Changeset - ca0e56faefb0 · protofusion repositories

Changeset - ca0e56faefb0

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 16 years ago 2009-07-26 16:25:10
ohnobinki@ohnopublishing.net

options_init() now respects DISTREN_CONFIG_PREFIX

2 files changed with 24 insertions and 10 deletions:

src/common/options.c

src/common/options.h

0 comments (0 inline, 0 general)

src/common/options.c

➞

Show inline comments

@@ @@ -33,12 +33,15 @@ @@
 struct options_common_data
+{
   cfg_t *cfg;
 };
 /**
    Not reentrant because of call to getenv()
  */
 int options_init(int argc, char *argv[], cfg_t **mycfg, cfg_opt_t *myopts, char *myname, struct options_common **allopts)
+{
   char *configfileprefix;
   char *configfile;
   size_t i;
@@ @@ -68,33 +71,44 @@ int options_init(int argc, char *argv[], @@
 	fprintf(stderr, "Option -%c requires an argument\n", optopt);
 	return 1;
+      }
   /* restore optind for other people who use getopt */
   optind = 1;
   if(!configfileprefix
      && (configfileprefix = getenv("DISTREN_CONFIG_PREFIX")) )
+    {
       configfileprefix = strdup(configfileprefix);
       if(!configfileprefix)
+	{
 	  fprintf(stderr, "OOM\n");
 	  return 1;
+	}
+    }
   /* For those of you who don't know, the following is an example of concatenation of constant strings by the C compiler. Now, that doesn't mean you can do run-time string concatenation ;-)
      strdup is because someday configfile will be customizable via argv[]
   */
   if(!configfileprefix)
     configfileprefix = strdup(SYSCONFDIR "/distren");
+      configfileprefix = strdup(SYSCONFDIR "/distren");
   if(!configfileprefix)
+    {
     fprintf(stderr, "OOM\n");
     return 1;
       fprintf(stderr, "OOM\n");
       return 1;
+    }
   /* For those of you who don't know, the following is an example of concatenation of constant strings by the C compiler. Now, that doesn't mean you can do run-time string concatenation ;-)
    strdup is because someday configfile will be customizable via argv[]
    */
   i = strlen(SYSCONFDIR "/distren.conf") + strlen(myname) + 1;
   i = strlen(configfileprefix) + strlen(myname) + strlen(".conf") + 1;
   configfile = malloc(i);
   if(!configfile)
+    {
       perror("malloc");
       return 1;
+    }
-  strncpy(configfile, SYSCONFDIR "/distren", strlen(SYSCONFDIR "/distren") + 1);
+  strncpy(configfile, configfileprefix, strlen(configfileprefix) + 1);
   strcat(configfile, myname);
   strcat(configfile, ".conf");
   fprintf(stderr, "using configuration file: %s\n", configfile);
   *allopts = malloc(sizeof(struct options_common));
   if(!*allopts)
+    {
       perror("malloc");
       free(configfile);

src/common/options.h

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ struct options_common @@
 /**
   This function needs to eat some of your arguments to it, just like gtk+ and other libs like to. It particularly needs to be able to find the location of the config file, which should be taken from arguments if it's there. The argument list will have members that I recognize removed.
   Options should be kept alive during the program's life.
-  The environment variable DISTREN_CONFIG, the built-in default config file location, or arguments passed on the commandline are used to determine the prefix of the config file name. Order of precedence: The command line is used first, then the environment variable, and then the default if no others sources specify the prefix.
+  The environment variable DISTREN_CONFIG_PREFIX, the built-in default config file location, or arguments passed on the commandline are used to determine the prefix of the config file name. Order of precedence: The command line is used first, then the environment variable, and then the default if no others sources specify the prefix.
   A calling function must call options_init() before processing its own arguments so that the libdistrencommon-specific help listing may be shown. The caller must also ignore libdistrencommon specific options. To avoid complication, those arguments are "c:h". Obviously, "h" should be handled sspecially ;-) (i.e., the caller should not ignore the "h" switch... it should output information about arguments it supports). Of course, calling functions could just rely on the
   \param mycfg will be set to the section of the configuration file specific to the caller (client or server specific section). Who is supposed to free this variable?
   \param myopts holds the caller's confuse option declarations
   \param myname holds the name of the section of the config file that refers to mycfg and myopts -- currently ``slave'', ``client'', and ``server'' are valid

0 comments (0 inline, 0 general)