Remove unneeded incomplete, member-less `struct tag;'.

[nmh] / uip / mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 25ac9ab0b7a430654b9747e870dcf8752b9c08f7..905dfa7c549af372802a29f68a14e07ad08d7d27 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhcachesbr.c -- routines to manipulate the MIME content cache
+/* mhcachesbr.c -- routines to manipulate the MIME content cache

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -9,10 +7,7 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
 
 #include <h/mh.h>
 #include <fcntl.h>

-#include <h/signals.h>

 #include <h/md5.h>
 #include <h/md5.h>

-#include <errno.h>
-#include <signal.h>

 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>


@@ -27,8 +22,6 @@
 
 extern int debugsw;
 
 
 extern int debugsw;
 

-extern pid_t xpid;     /* mhshowsbr.c or mhbuildsbr.c */
-

 /* cache policies */
 int rcachesw = CACHE_ASK;
 int wcachesw = CACHE_ASK;
 /* cache policies */
 int rcachesw = CACHE_ASK;
 int wcachesw = CACHE_ASK;


@@ -42,7 +35,7 @@ char *cache_private;
 
 
 /* mhmisc.c */
 
 
 /* mhmisc.c */

-int part_ok (CT, int);
+int part_ok (CT);

 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 int type_ok (CT, int);
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);


@@ -96,22 +89,22 @@ cache_content (CT ct)
 {
     int        cachetype;
     char *file, cachefile[BUFSIZ];
 {
     int        cachetype;
     char *file, cachefile[BUFSIZ];

-    CE ce = ct->c_cefile;
+    CE ce = &ct->c_cefile;

 
     if (!ct->c_id) {
 
     if (!ct->c_id) {

-       advise (NULL, "no %s: field in %s", ID_FIELD, ct->c_file);
+       inform("no %s: field in %s", ID_FIELD, ct->c_file);

        return;
     }
 
     if (!ce) {
        return;
     }
 
     if (!ce) {

-       advise (NULL, "unable to decode %s", ct->c_file);
+       inform("unable to decode %s", ct->c_file);

        return;
     }
 
     if (find_cache (NULL, wcachesw != CACHE_NEVER ? wcachesw : CACHE_ASK,
                    &cachetype, ct->c_id, cachefile, sizeof(cachefile))
            == NOTOK) {
        return;
     }
 
     if (find_cache (NULL, wcachesw != CACHE_NEVER ? wcachesw : CACHE_ASK,
                    &cachetype, ct->c_id, cachefile, sizeof(cachefile))
            == NOTOK) {

-       advise (NULL, "unable to cache %s's contents", ct->c_file);
+       inform("unable to cache %s's contents", ct->c_file);

        return;
     }
     if (wcachesw != CACHE_NEVER && wcachesw != CACHE_ASK) {
        return;
     }
     if (wcachesw != CACHE_NEVER && wcachesw != CACHE_ASK) {


@@ -140,16 +133,18 @@ cache_content (CT ct)
 
            while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
                       > 0)
 
            while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
                       > 0)

-               fwrite (buffer, sizeof(*buffer), cc, fp);
+               if ((int) fwrite (buffer, sizeof(*buffer), cc, fp) < cc) {
+                   advise ("cache_content", "fwrite");
+               }

            fflush (fp);
 
            if (ferror (gp)) {
                admonish (ce->ce_file, "error reading");
            fflush (fp);
 
            if (ferror (gp)) {
                admonish (ce->ce_file, "error reading");

-               unlink (cachefile);
+               (void) m_unlink (cachefile);

            } else {
                if (ferror (fp)) {
                    admonish (cachefile, "error writing");
            } else {
                if (ferror (fp)) {
                    admonish (cachefile, "error writing");

-                   unlink (cachefile);
+                   (void) m_unlink (cachefile);

                }
            }
            fclose (fp);
                }
            }
            fclose (fp);


@@ -228,20 +223,13 @@ got_it:
        int len, buflen;
        char *bp, query[BUFSIZ];
 
        int len, buflen;
        char *bp, query[BUFSIZ];
 

-       if (xpid) {
-           if (xpid < 0)
-               xpid = -xpid;
-           pidcheck (pidwait (xpid, NOTOK));
-           xpid = 0;
-       }
-

        /* Get buffer ready to go */
        bp = query;
        buflen = sizeof(query);
 
        /* Now, construct query */
        if (writing) {
        /* Get buffer ready to go */
        bp = query;
        buflen = sizeof(query);
 
        /* Now, construct query */
        if (writing) {

-           snprintf (bp, buflen, "Make cached, publically-accessible copy");
+           snprintf (bp, buflen, "Make cached, publicly-accessible copy");

        } else {
            struct stat st;
 
        } else {
            struct stat st;
 


@@ -268,14 +256,14 @@ got_it:
        snprintf (bp, buflen, "\n    in file %s? ", buffer);
 
        /* Now, check answer */
        snprintf (bp, buflen, "\n    in file %s? ", buffer);
 
        /* Now, check answer */

-       if (!getanswer (query))
+       if (!read_yes_or_no_if_tty (query))

            status = NOTOK;
     }
 
     if (status == OK && writing) {
        if (*writing && strchr(buffer, '/'))
            make_intermediates (buffer);
            status = NOTOK;
     }
 
     if (status == OK && writing) {
        if (*writing && strchr(buffer, '/'))
            make_intermediates (buffer);

-       unlink (buffer);
+       (void) m_unlink (buffer);

     }
 
     free (id);
     }
 
     free (id);


@@ -290,6 +278,7 @@ find_cache_aux (int writing, char *directory, char *id,
     int        mask, usemap;
     char mapfile[BUFSIZ], mapname[BUFSIZ];
     FILE *fp;
     int        mask, usemap;
     char mapfile[BUFSIZ], mapname[BUFSIZ];
     FILE *fp;

+    int failed_to_lock = 0;

     static int partno, pid;
     static time_t clock = 0;
 
     static int partno, pid;
     static time_t clock = 0;
 


@@ -344,19 +333,22 @@ use_raw:
 
     make_intermediates (mapfile);
     mask = umask (writing == 2 ? 0077 : 0);
 
     make_intermediates (mapfile);
     mask = umask (writing == 2 ? 0077 : 0);

-    if (!(fp = lkfopen (mapfile, "a")) && errno == ENOENT) {
+    if (!(fp = lkfopendata (mapfile, "a", &failed_to_lock)) && errno == ENOENT) {

        int fd;
 
        if ((fd = creat (mapfile, 0666)) != NOTOK) {
            close (fd);
        int fd;
 
        if ((fd = creat (mapfile, 0666)) != NOTOK) {
            close (fd);

-           fp = lkfopen (mapfile, "a");
+           fp = lkfopendata (mapfile, "a", &failed_to_lock);
+            if (failed_to_lock) {
+               adios (mapfile, "failed to lock");
+            }

        }
     }
     umask (mask);
     if (!fp)
        return NOTOK;
     fprintf (fp, "%s: %s\n", mapname, id);
        }
     }
     umask (mask);
     if (!fp)
        return NOTOK;
     fprintf (fp, "%s: %s\n", mapname, id);

-    lkfclose (fp, mapfile);
+    lkfclosedata (fp, mapfile);

 
 done_map:
     if (*mapname == '/')
 
 done_map:
     if (*mapname == '/')


@@ -377,8 +369,9 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
     m_getfld_state_t gstate = 0;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
     m_getfld_state_t gstate = 0;

+    int failed_to_lock = 0;

 
 

-    if (!(fp = lkfopen (mapfile, "r")))
+    if (!(fp = lkfopendata (mapfile, "r", &failed_to_lock)))

        return NOTOK;
 
     for (;;) {
        return NOTOK;
 
     for (;;) {


@@ -393,7 +386,7 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
                if (state != FLDPLUS)
                    cp = buf;
                else {
                if (state != FLDPLUS)
                    cp = buf;
                else {

-                   cp = add (buf, NULL);
+                   cp = mh_xstrdup(buf);

                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
                        state = m_getfld (&gstate, name, buf, &bufsz, fp);
                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
                        state = m_getfld (&gstate, name, buf, &bufsz, fp);


@@ -409,7 +402,7 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
                result = strcmp (id, dp);
                free (dp);
                if (result == 0) {
                result = strcmp (id, dp);
                free (dp);
                if (result == 0) {

-                   lkfclose (fp, mapfile);
+                   lkfclosedata (fp, mapfile);

                    return OK;
                }
                continue;
                    return OK;
                }
                continue;


@@ -423,6 +416,6 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
     }
     m_getfld_state_destroy (&gstate);
 
     }
     m_getfld_state_destroy (&gstate);
 

-    lkfclose (fp, mapfile);
+    lkfclosedata (fp, mapfile);

     return NOTOK;
 }
     return NOTOK;
 }