* nscd/nscd.c (main): Use error while process isn't running in the

	background, not dbg_log.
	* nscd/nscd_conf.c (nscd_parse_file): Likewise.
	Mark messages with _().  Unify testing for database name.

	* sysdeps/unix/sysv/linux/Versions: Export inotify_* syscalls.

diff --git a/ChangeLog b/ChangeLog
index 08036d8..0b7cca8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-23  Ulrich Drepper  <drepper@redhat.com>
 
+       * nscd/nscd.c (main): Use error while process isn't running in the
+       background, not dbg_log.
+       * nscd/nscd_conf.c (nscd_parse_file): Likewise.
+       Mark messages with _().  Unify testing for database name.
+
        * nscd/connection.c (DEFAULT_DATASIZE_PER_BUCKET): Move to nscd.h.
        (dbs): Initialize max_db_size fields.
        (nscd_init): When mapping the database, use max_db_size as the
@@ -27,7 +32,7 @@
        (receive_print_stats): Likewise.
        * nscd/pwdcache.c (cache_addpw): Likewise.
 
-       * sysdeps/unix/sysv/linux/Versions: Export Inotify_* syscalls.
+       * sysdeps/unix/sysv/linux/Versions: Export inotify_* syscalls.
 
 2005-08-22  Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/nscd/nscd.c b/nscd/nscd.c
index c16152c..f96f44e 100644 (file)
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -150,12 +150,10 @@ main (int argc, char **argv)
 
   /* Read the configuration file.  */
   if (nscd_parse_file (conffile, dbs) != 0)
-    {
-      /* We couldn't read the configuration file.  We don't start the
-        server.  */
-      dbg_log (_("cannot read configuration file; this is fatal"));
-      exit (1);
-    }
+    /* We couldn't read the configuration file.  We don't start the
+       server.  */
+    error (EXIT_FAILURE, 0,
+          _("failure while reading configuration file; this is fatal"));
 
   /* Do we only get statistics?  */
   if (get_stats)

diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c
index c5c06ae..1039250 100644 (file)
--- a/nscd/nscd_conf.c
+++ b/nscd/nscd_conf.c
@@ -19,6 +19,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <error.h>
 #include <libintl.h>
 #include <malloc.h>
 #include <pwd.h>
@@ -45,6 +46,18 @@ const char *dbnames[lastdb] =
   [hstdb] = "hosts"
 };
 
+
+static int
+find_db (const char *name)
+{
+  for (int cnt = 0; cnt < lastdb; ++cnt)
+    if (strcmp (name, dbnames[cnt]) == 0)
+      return cnt;
+
+  error (0, 0, _("database %s is not supported\n"), name);
+  return -1;
+}
+
 int
 nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
 {
@@ -52,6 +65,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
   char *line, *cp, *entry, *arg1, *arg2;
   size_t len;
   int cnt;
+  const unsigned int initial_error_message_count = error_message_count;
 
   /* Open the configuration file.  */
   fp = fopen (fname, "r");
@@ -91,7 +105,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
       ++arg1;
       *cp = '\0';
       if (strlen (entry) == 0)
-       dbg_log (_("Parse error: %s"), line);
+       error (0, 0, _("Parse error: %s"), line);
       while (isspace (*arg1) && *arg1 != '\0')
        ++arg1;
       cp = arg1;
@@ -112,75 +126,49 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
 
       if (strcmp (entry, "positive-time-to-live") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               dbs[cnt].postimeout = atol (arg2);
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           dbs[idx].postimeout = atol (arg2);
        }
       else if (strcmp (entry, "negative-time-to-live") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               dbs[cnt].negtimeout = atol (arg2);
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           dbs[idx].negtimeout = atol (arg2);
        }
       else if (strcmp (entry, "suggested-size") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               dbs[cnt].suggested_module = atol (arg2);
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           dbs[idx].suggested_module = atol (arg2);
        }
       else if (strcmp (entry, "enable-cache") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               if (strcmp (arg2, "no") == 0)
-                 dbs[cnt].enabled = 0;
-               else if (strcmp (arg2, "yes") == 0)
-                 dbs[cnt].enabled = 1;
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           {
+             if (strcmp (arg2, "no") == 0)
+               dbs[idx].enabled = 0;
+             else if (strcmp (arg2, "yes") == 0)
+               dbs[idx].enabled = 1;
+           }
        }
       else if (strcmp (entry, "check-files") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               if (strcmp (arg2, "no") == 0)
-                 dbs[cnt].check_file = 0;
-               else if (strcmp (arg2, "yes") == 0)
-                 dbs[cnt].check_file = 1;
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           {
+             if (strcmp (arg2, "no") == 0)
+               dbs[idx].check_file = 0;
+             else if (strcmp (arg2, "yes") == 0)
+               dbs[idx].check_file = 1;
+           }
        }
       else if (strcmp (entry, "max-db-size") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               dbs[cnt].max_db_size = atol (arg2);
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           dbs[idx].max_db_size = atol (arg2);
        }
       else if (strcmp (entry, "logfile") == 0)
        set_logfile (arg1);
@@ -202,14 +190,14 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
       else if (strcmp (entry, "server-user") == 0)
         {
           if (!arg1)
-            dbg_log (_("Must specify user name for server-user option"));
+            error (0, 0, _("Must specify user name for server-user option"));
           else
             server_user = xstrdup (arg1);
         }
       else if (strcmp (entry, "stat-user") == 0)
         {
           if (arg1 == NULL)
-            dbg_log (_("Must specify user name for stat-user option"));
+            error (0, 0, _("Must specify user name for stat-user option"));
           else
            {
              stat_user = xstrdup (arg1);
@@ -221,31 +209,25 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
         }
       else if (strcmp (entry, "persistent") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               if (strcmp (arg2, "no") == 0)
-                 dbs[cnt].persistent = 0;
-               else if (strcmp (arg2, "yes") == 0)
-                 dbs[cnt].persistent = 1;
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           {
+             if (strcmp (arg2, "no") == 0)
+               dbs[idx].persistent = 0;
+             else if (strcmp (arg2, "yes") == 0)
+               dbs[idx].persistent = 1;
+           }
        }
       else if (strcmp (entry, "shared") == 0)
        {
-         for (cnt = 0; cnt < lastdb; ++cnt)
-           if (strcmp (arg1, dbnames[cnt]) == 0)
-             {
-               if (strcmp (arg2, "no") == 0)
-                 dbs[cnt].shared = 0;
-               else if (strcmp (arg2, "yes") == 0)
-                 dbs[cnt].shared = 1;
-               break;
-             }
-         if (cnt == lastdb)
-           dbg_log ("database %s is not supported\n", arg1);
+         int idx = find_db (arg1);
+         if (idx >= 0)
+           {
+             if (strcmp (arg2, "no") == 0)
+               dbs[idx].shared = 0;
+             else if (strcmp (arg2, "yes") == 0)
+               dbs[idx].shared = 1;
+           }
        }
       else if (strcmp (entry, "reload-count") == 0)
        {
@@ -259,7 +241,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
              else if (count >= 0)
            reload_count = count;
              else
-               dbg_log (_("invalid value for 'reload-count': %u"), count);
+               error (0, 0, _("invalid value for 'reload-count': %u"), count);
            }
        }
       else if (strcmp (entry, "paranoia") == 0)
@@ -274,10 +256,10 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
          if (arg1 != NULL)
            restart_interval = atol (arg1);
          else
-            dbg_log (_("Must specify value for restart-interval option"));
+            error (0, 0, _("Must specify value for restart-interval option"));
        }
       else
-       dbg_log (_("Unknown option: %s %s %s"), entry, arg1, arg2);
+       error (0, 0, _("Unknown option: %s %s %s"), entry, arg1, arg2);
     }
   while (!feof_unlocked (fp));
 
@@ -290,7 +272,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb])
       oldcwd = get_current_dir_name ();
       if (oldcwd == NULL)
        {
-         dbg_log (_("\
+         error (0, 0, _("\
 cannot get current working directory: %s; disabling paranoia mode"),
                   strerror (errno));
          paranoia = 0;
@@ -310,7 +292,7 @@ cannot get current working directory: %s; disabling paranoia mode"),
                            * DEFAULT_DATASIZE_PER_BUCKET));
       if (datasize > dbs[cnt].max_db_size)
        {
-         dbg_log (_("maximum file size for %s database too small"),
+         error (0, 0, _("maximum file size for %s database too small"),
                   dbnames[cnt]);
          dbs[cnt].max_db_size = datasize;
        }
@@ -322,5 +304,5 @@ cannot get current working directory: %s; disabling paranoia mode"),
   /* Close configuration file.  */
   fclose (fp);
 
-  return 0;
+  return error_message_count != initial_error_message_count;
 }