X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6bc64765f773ce75454ec1592a86779e3547fe46..ec173fd2c:/uip/mhcachesbr.c?ds=sidebyside diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index 136b5678..942c3f01 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -1,31 +1,39 @@ - -/* - * 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 * complete copyright information. */ -#include +#include "h/mh.h" +#include "sbr/m_gmprot.h" +#include "sbr/m_getfld.h" +#include "sbr/read_yes_or_no_if_tty.h" +#include "sbr/trimcpy.h" +#include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "h/md5.h" +#include "h/mts.h" +#include "h/tws.h" +#include "h/mime.h" +#include "h/mhparse.h" +#include "h/mhcachesbr.h" +#include "h/utils.h" +#include "mhmisc.h" +#include "sbr/lock_file.h" +#include "sbr/m_mktemp.h" #ifdef HAVE_SYS_TIME_H # include #endif #include -extern int debugsw; +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(CACHE, caches); +#undef X +struct swit *cache_policy = caches; -extern pid_t xpid; /* mhshowsbr.c or mhbuildsbr.c */ +extern int debugsw; /* cache policies */ int rcachesw = CACHE_ASK; @@ -38,19 +46,6 @@ int wcachesw = CACHE_ASK; char *cache_public; char *cache_private; - -/* mhmisc.c */ -int part_ok (CT, int); -int type_ok (CT, int); -void content_error (char *, CT, char *, ...); -void flush_errors (void); - -/* - * prototypes - */ -void cache_all_messages (CT *); -int find_cache (CT, int, int *, char *, char *, int); - /* * static prototypes */ @@ -97,19 +92,19 @@ cache_content (CT ct) CE ce = &ct->c_cefile; 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) { - 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) { - 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) { @@ -138,7 +133,9 @@ cache_content (CT ct) 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)) { @@ -189,7 +186,7 @@ find_cache (CT ct, int policy, int *writing, char *id, case CACHE_PUBLIC: if (cache_private && !writing - && find_cache_aux (writing ? 2 : 0, cache_private, id, + && find_cache_aux (0, cache_private, id, buffer, buflen) == OK) { if (access (buffer, R_OK) != NOTOK) { got_private: @@ -226,20 +223,13 @@ got_it: 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) { - snprintf (bp, buflen, "Make cached, publically-accessible copy"); + snprintf (bp, buflen, "Make cached, publicly-accessible copy"); } else { struct stat st; @@ -266,7 +256,7 @@ got_it: snprintf (bp, buflen, "\n in file %s? ", buffer); /* Now, check answer */ - if (!getanswer (query)) + if (!read_yes_or_no_if_tty (query)) status = NOTOK; } @@ -285,13 +275,15 @@ static int find_cache_aux (int writing, char *directory, char *id, char *buffer, int buflen) { - int mask, usemap; + int mask; + bool usemap; char mapfile[BUFSIZ], mapname[BUFSIZ]; FILE *fp; + int failed_to_lock = 0; static int partno, pid; static time_t clock = 0; - usemap = 1; + usemap = true; if (debugsw) fprintf (stderr, "find_cache_aux %s usemap=%d\n", directory, usemap); @@ -342,12 +334,15 @@ use_raw: make_intermediates (mapfile); mask = umask (writing == 2 ? 0077 : 0); - if (!(fp = lkfopendata (mapfile, "a")) && errno == ENOENT) { + if (!(fp = lkfopendata (mapfile, "a", &failed_to_lock)) && errno == ENOENT) { int fd; if ((fd = creat (mapfile, 0666)) != NOTOK) { close (fd); - fp = lkfopendata (mapfile, "a"); + fp = lkfopendata (mapfile, "a", &failed_to_lock); + if (failed_to_lock) { + adios (mapfile, "failed to lock"); + } } } umask (mask); @@ -372,29 +367,31 @@ static int find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen) { int state; - char buf[BUFSIZ], name[NAMESZ]; + char buf[NMH_BUFSIZ], name[NAMESZ]; FILE *fp; - m_getfld_state_t gstate = 0; + m_getfld_state_t gstate; + int failed_to_lock = 0; - if (!(fp = lkfopendata (mapfile, "r"))) + if (!(fp = lkfopendata (mapfile, "r", &failed_to_lock))) return NOTOK; + gstate = m_getfld_state_init(fp); for (;;) { int result; char *cp, *dp; int bufsz = sizeof buf; - switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) { + switch (state = m_getfld2(&gstate, name, buf, &bufsz)) { case FLD: case FLDPLUS: strncpy (mapname, name, namelen); 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); + state = m_getfld2(&gstate, name, buf, &bufsz); cp = add (buf, cp); } }