BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / amd / info_file.c

diff --git a/usr/src/usr.sbin/amd/amd/info_file.c b/usr/src/usr.sbin/amd/amd/info_file.c
index c68d57d..7131810 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/info_file.c
+++ b/usr/src/usr.sbin/amd/amd/info_file.c
@@ -1,6 +1,4 @@
 /*
 /*

- * $Id: info_file.c,v 5.2 90/06/23 22:19:29 jsp Rel $
- *

  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.
  * Copyright (c) 1990 Jan-Simon Pendry
  * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1990 The Regents of the University of California.


@@ -9,21 +7,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)info_file.c 5.3 (Berkeley) 5/12/91
+ *
+ * $Id: info_file.c,v 5.2.1.4 91/05/07 22:17:57 jsp Alpha $

  *
  *

- *     @(#)info_file.c 5.1 (Berkeley) 6/29/90

  */
 
 /*
  */
 
 /*


@@ -38,6 +53,7 @@
 
 #define        MAX_LINE_LEN    2048
 
 
 #define        MAX_LINE_LEN    2048
 

+static int read_line P((char *buf, int size, FILE *fp));

 static int read_line(buf, size, fp)
 char *buf;
 int size;
 static int read_line(buf, size, fp)
 char *buf;
 int size;


@@ -54,6 +70,7 @@ FILE *fp;
                                int ch;
                                buf += len - 2;
                                size -= len - 2;
                                int ch;
                                buf += len - 2;
                                size -= len - 2;

+                               *buf = '\n'; buf[1] = '\0';

                                /*
                                 * Skip leading white space on next line
                                 */
                                /*
                                 * Skip leading white space on next line
                                 */


@@ -73,6 +90,7 @@ FILE *fp;
 /*
  * Try to locate a key in a file
  */
 /*
  * Try to locate a key in a file
  */

+static int search_or_reload_file P((FILE *fp, char *map, char *key, char **val, mnt_map *m, void (*fn)(mnt_map *m, char*, char*)));

 static int search_or_reload_file(fp, map, key, val, m, fn)
 FILE *fp;
 char *map;
 static int search_or_reload_file(fp, map, key, val, m, fn)
 FILE *fp;
 char *map;


@@ -133,7 +151,7 @@ void (*fn) P((mnt_map*, char*, char*));
                if (*cp)
                        *cp++ = '\0';
 
                if (*cp)
                        *cp++ = '\0';
 

-               if ((*key == *kp && strcmp(key, kp) == 0) || fn) {
+               if (fn || (*key == *kp && strcmp(key, kp) == 0)) {

                        while (*cp && isascii(*cp) && isspace(*cp))
                                cp++;
                        if (*cp) {
                        while (*cp && isascii(*cp) && isspace(*cp))
                                cp++;
                        if (*cp) {


@@ -141,13 +159,14 @@ void (*fn) P((mnt_map*, char*, char*));
                                 * Return a copy of the data
                                 */
                                char *dc = strdup(cp);
                                 * Return a copy of the data
                                 */
                                char *dc = strdup(cp);

-                               if (fn)
-                                       (*fn)(m, kp, dc);
-                               else
+                               if (fn) {
+                                       (*fn)(m, strdup(kp), dc);
+                               } else {

                                        *val = dc;
 #ifdef DEBUG
                                        *val = dc;
 #ifdef DEBUG

-                               dlog("%s returns %s", key, dc);
+                                       dlog("%s returns %s", key, dc);

 #endif /* DEBUG */
 #endif /* DEBUG */

+                               }

                                if (!fn)
                                        return 0;
                        } else {
                                if (!fn)
                                        return 0;
                        } else {


@@ -171,10 +190,28 @@ again:
        return fn ? 0 : ENOENT;
 }
 
        return fn ? 0 : ENOENT;
 }
 

-int file_init(map)
+static FILE *file_open P((char *map, time_t *tp));
+static FILE *file_open(map, tp)

 char *map;
 char *map;

+time_t *tp;

 {
        FILE *mapf = fopen(map, "r");
 {
        FILE *mapf = fopen(map, "r");

+       if (mapf && tp) {
+               struct stat stb;
+               if (fstat(fileno(mapf), &stb) < 0)
+                       *tp = clocktime();
+               else
+                       *tp = stb.st_mtime;
+       }
+       return mapf;
+}
+
+int file_init P((char *map, time_t *tp));
+int file_init(map, tp)
+char *map;
+time_t *tp;
+{
+       FILE *mapf = file_open(map, tp);

        if (mapf) {
                (void) fclose(mapf);
                return 0;
        if (mapf) {
                (void) fclose(mapf);
                return 0;


@@ -182,12 +219,13 @@ char *map;
        return errno;
 }
 
        return errno;
 }
 

+int file_reload P((mnt_map *m, char *map, void (*fn)()));

 int file_reload(m, map, fn)
 mnt_map *m;
 char *map;
 void (*fn)();
 {
 int file_reload(m, map, fn)
 mnt_map *m;
 char *map;
 void (*fn)();
 {

-       FILE *mapf = fopen(map, "r");
+       FILE *mapf = file_open(map, (time_t *) 0);

        if (mapf) {
                int error = search_or_reload_file(mapf, map, 0, 0, m, fn);
                (void) fclose(mapf);
        if (mapf) {
                int error = search_or_reload_file(mapf, map, 0, 0, m, fn);
                (void) fclose(mapf);


@@ -197,6 +235,7 @@ void (*fn)();
        return errno;
 }
 
        return errno;
 }
 

+int file_search P((mnt_map *m, char *map, char *key, char **pval, time_t *tp));

 int file_search(m, map, key, pval, tp)
 mnt_map *m;
 char *map;
 int file_search(m, map, key, pval, tp)
 mnt_map *m;
 char *map;


@@ -204,13 +243,12 @@ char *key;
 char **pval;
 time_t *tp;
 {
 char **pval;
 time_t *tp;
 {

-       FILE *mapf = fopen(map, "r");
+       time_t t;
+       FILE *mapf = file_open(map, &t);

        if (mapf) {
        if (mapf) {

-               struct stat stb;

                int error;
                int error;

-               error = fstat(fileno(mapf), &stb);
-               if (!error && *tp < stb.st_mtime) {
-                       *tp = stb.st_mtime;
+               if (*tp < t) {
+                       *tp = t;

                        error = -1;
                } else {
                        error = search_or_reload_file(mapf, map, key, pval, 0, 0);
                        error = -1;
                } else {
                        error = search_or_reload_file(mapf, map, key, pval, 0, 0);


@@ -221,4 +259,18 @@ time_t *tp;
 
        return errno;
 }
 
        return errno;
 }

+
+int file_mtime P((char *map, time_t *tp));
+int file_mtime(map, tp)
+char *map;
+time_t *tp;
+{
+       FILE *mapf = file_open(map, tp);
+       if (mapf) {
+               (void) fclose(mapf);
+               return 0;
+       }
+
+       return errno;
+}

 #endif /* HAS_FILE_MAPS */
 #endif /* HAS_FILE_MAPS */