-
-/*
- * mhstoresbr.c -- routines to save/store the contents of MIME messages
+/* mhstoresbr.c -- routines to save/store the contents of MIME messages
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
#include <h/mh.h>
#include <fcntl.h>
-#include <h/signals.h>
#include <h/md5.h>
#include <h/mts.h>
#include <h/tws.h>
+#include <h/fmt_scan.h>
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/utils.h>
+#include "mhshowsbr.h"
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
enum clobber_policy_t {
NMH_CLOBBER_ALWAYS = 0,
enum clobber_policy_t clobber_policy; /* -clobber selection */
};
+static bool use_param_as_filename(const char *p);
+
mhstoreinfo_t
mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
- mhstoreinfo_t info = mh_xmalloc (sizeof *info);
+ mhstoreinfo_t info;
+ NEW(info);
info->cts = ct;
info->cwd = pwd;
info->autosw = asw;
/* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
int type_ok (CT, int);
void flush_errors (void);
* store any contents.
*/
if ((cp = context_find (nmhstorage)) && *cp)
- info->dir = getcpy (cp);
+ info->dir = mh_xstrdup(cp);
else
info->dir = getcpy (info->cwd);
for (part = m->mp_parts; part; part = part->mp_next) {
CT p = part->mp_part;
- if (part_ok (p, 1) && type_ok (p, 1)) {
+ if (part_ok (p) && type_ok (p, 1)) {
if (ct->c_storage) {
/* Support mhstore -outfile. The MIME parser doesn't
load c_storage, so we know that p->c_storage is
NULL here. */
- p->c_storage = add (ct->c_storage, NULL);
+ p->c_storage = mh_xstrdup(ct->c_storage);
}
result = store_switch (p, info);
}
if (hi == 0) {
- advise (NULL, "missing (at least) last part of multipart message");
+ inform("missing (at least) last part of multipart message");
return NOTOK;
}
- if ((base = (CT *) mh_xcalloc ((size_t) (i + 1), sizeof(*base))) == NULL)
- adios (NULL, "out of memory");
-
+ base = mh_xcalloc(i + 1, sizeof *base);
ctq = base;
for (ctp = info->cts; *ctp; ctp++) {
p = *ctp;
for (ctq = base; *ctq; ctq++) {
p = *ctq;
pm = (struct partial *) p->c_ctparams;
- if (pm->pm_marked != cur) {
- if (pm->pm_marked == cur - 1) {
- admonish (NULL,
- "duplicate part %d of %d part multipart message",
- pm->pm_marked, hi);
- continue;
- }
+ if (pm->pm_marked == cur) {
+ cur++;
+ continue;
+ }
+
+ if (pm->pm_marked == cur - 1) {
+ inform("duplicate part %d of %d part multipart message, continuing...",
+ pm->pm_marked, hi);
+ continue;
+ }
missing_part:
- advise (NULL,
- "missing %spart %d of %d part multipart message",
- cur != hi ? "(at least) " : "", cur, hi);
- goto losing;
- }
- else
- cur++;
+ inform("missing %spart %d of %d part multipart message",
+ cur != hi ? "(at least) " : "", cur, hi);
+ goto losing;
}
if (hi != --cur) {
cur = hi;
ct = *ctq++;
if (store_content (ct, NULL, info) == NOTOK) {
losing:
- free ((char *) base);
+ free(base);
return NOTOK;
}
goto losing;
}
- free ((char *) base);
+ free(base);
return OK;
}
if (info->autosw) {
char *cp;
- if ((cp = e->eb_name)
- && *cp != '/'
- && *cp != '.'
- && *cp != '|'
- && *cp != '!'
- && !strchr (cp, '%')) {
+ if ((cp = e->eb_name) && use_param_as_filename(cp)) {
if (!ct->c_storeproc)
- ct->c_storeproc = add (cp, NULL);
+ ct->c_storeproc = mh_xstrdup(cp);
if (!p->c_storeproc)
- p->c_storeproc = add (cp, NULL);
+ p->c_storeproc = mh_xstrdup(cp);
}
}
if (ct->c_storage) {
/* Support mhstore -outfile. The MIME parser doesn't load
c_storage, so we know that p->c_storage is NULL here. */
- p->c_storage = add (ct->c_storage, NULL);
+ p->c_storage = mh_xstrdup(ct->c_storage);
}
result = store_switch (p, info);
/* record the folder name */
if (p->c_folder) {
- ct->c_folder = add (p->c_folder, NULL);
+ ct->c_folder = mh_xstrdup(p->c_folder);
}
}
goto got_filename;
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ct->c_storage = add (tmpfilenam, NULL);
+ ct->c_storage = mh_xstrdup(tmpfilenam);
/* Get the folder name */
if (cp[1])
create_folder(m_mailpath(folder), 0, exit);
/* Record the folder name */
- ct->c_folder = add (folder, NULL);
+ ct->c_folder = mh_xstrdup(folder);
if (cp[1])
free (folder);
return show_content_aux (ct, 0, buffer + 1, info->dir, NULL);
/* record the filename */
- if ((ct->c_storage = clobber_check (add (buffer, NULL), info)) ==
+ if ((ct->c_storage = clobber_check (mh_xstrdup(buffer), info)) ==
NULL) {
return NOTOK;
}
if (first_partial)
fprintf (stderr, "reassembling partials ");
if (last_partial)
- fprintf (stderr, "%s", ct->c_file);
+ fputs(ct->c_file, stderr);
else
fprintf (stderr, "%s,", ct->c_file);
} else {
int cwdlen = strlen (info->cwd);
fprintf (stderr, " as file %s\n",
- strncmp (ct->c_storage, info->cwd, cwdlen)
+ !has_prefix(ct->c_storage, info->cwd)
|| ct->c_storage[cwdlen] != '/'
? ct->c_storage : ct->c_storage + cwdlen + 1);
}
int cc, fd;
if (!ct->c_ceopenfnx) {
- advise (NULL, "don't know how to decode part %s of message %s",
+ inform("don't know how to decode part %s of message %s",
ct->c_partno, ct->c_file);
return NOTOK;
}
}
}
- while (fgets (buffer, sizeof(buffer) - 1, ct->c_fp)) {
+ while (fgets (buffer, sizeof buffer, ct->c_fp)) {
if ((pos += strlen (buffer)) > last) {
int diff;
/* Read the folder. */
if ((mp = folder_read (folder, 0))) {
/* Link file into folder */
- msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, (char *)0);
+ msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, NULL);
} else {
- advise (NULL, "unable to read folder %s", folder);
+ inform("unable to read folder %s", folder);
return NOTOK;
}
* appropriate directory.
*/
if (*cp != '/' && *cp != '|' && *cp != '!') {
- snprintf (bp, buflen, "%s/", dir[1] ? dir : "");
+ if (!strcmp(dir, "/"))
+ dir = ""; /* Don't start with "//". */
+ snprintf (bp, buflen, "%s/", dir);
len = strlen (bp);
bp += len;
buflen -= len;
*bp = '\0';
buflen--;
continue;
- } else {
+ }
+ {
PM pm;
char *s = "";
break;
case 'p':
- /* insert part number withouth leading dot */
+ /* insert part number without leading dot */
if (ct->c_partno)
strncpy (bp, ct->c_partno, buflen);
break;
* use that (RFC-2183).
*/
if (ct->c_dispo) {
- if ((cp = get_param(ct->c_dispo_first, "filename", '_', 0))
- && *cp != '/'
- && *cp != '.'
- && *cp != '|'
- && *cp != '!'
- && !strchr (cp, '%')) {
- ct->c_storeproc = add (cp, NULL);
+ if ((cp = get_param(ct->c_dispo_first, "filename", '_', 0)) &&
+ use_param_as_filename(cp)) {
+ ct->c_storeproc = mh_xstrdup(cp);
free(cp);
return;
}
- if (cp)
- free(cp);
+ mh_xfree(cp);
}
/*
* the storeproc.
*/
ci = &ct->c_ctinfo;
- if ((cp = get_param(ci->ci_first_pm, "name", '_', 0))
- && *cp != '/'
- && *cp != '.'
- && *cp != '|'
- && *cp != '!'
- && !strchr (cp, '%')) {
- ct->c_storeproc = add (cp, NULL);
+ if ((cp = get_param(ci->ci_first_pm, "name", '_', 0)) &&
+ use_param_as_filename(cp)) {
+ ct->c_storeproc = mh_xstrdup(cp);
}
- if (cp)
- free(cp);
+ mh_xfree(cp);
}
enum clobber_policy_t
clobber_policy (const char *value) {
if (value == NULL || ! strcasecmp (value, "always")) {
- } else if (! strcasecmp (value, "auto")) {
+ return NMH_CLOBBER_ALWAYS;
+ }
+ if (! strcasecmp (value, "auto")) {
return NMH_CLOBBER_AUTO;
- } else if (! strcasecmp (value, "suffix")) {
+ }
+ if (! strcasecmp (value, "suffix")) {
return NMH_CLOBBER_SUFFIX;
- } else if (! strcasecmp (value, "ask")) {
+ }
+ if (! strcasecmp (value, "ask")) {
return NMH_CLOBBER_ASK;
- } else if (! strcasecmp (value, "never")) {
+ }
+ if (! strcasecmp (value, "never")) {
return NMH_CLOBBER_NEVER;
- } else {
- adios (NULL, "invalid argument, %s, to clobber", value);
}
- return NMH_CLOBBER_ALWAYS;
+ adios (NULL, "invalid argument, %s, to clobber", value);
}
default:
/* Should never get here. */
- advise (NULL, "will not overwrite %s, invalid clobber policy", buffer);
+ inform("will not overwrite %s, invalid clobber policy", buffer);
free (buffer);
return NULL;
}
free (file);
if (version >= max_versions) {
- advise (NULL, "will not overwrite %s, too many versions", buffer);
+ inform("will not overwrite %s, too many versions", buffer);
free (buffer);
buffer = NULL;
}
/* Save cwd for possible use in loop below. */
char *slash;
- cwd = add (original_file, NULL);
+ cwd = mh_xstrdup(original_file);
slash = strrchr (cwd, '/');
if (slash) {
if (isatty (fileno (stdin))) {
char *prompt =
concat ("Overwrite \"", file, "\" [y/n/rename]? ", NULL);
- ans = getans (prompt, answer);
+ ans = read_switch_multiword (prompt, answer);
free (prompt);
} else {
/* Overwrite, that's what nmh used to do. And warn. */
- advise (NULL, "-clobber ask but no tty, so overwrite %s", file);
+ inform("-clobber ask but no tty, so overwrite %s", file);
break;
}
file = NULL;
++info->files_not_clobbered;
} else {
- char *newline = strchr (buf, '\n');
- if (newline) {
- *newline = '\0';
- }
+ trim_suffix_c(buf, '\n');
}
free (file);
if (buf[0] == '/') {
/* Full path, use it. */
- file = add (buf, NULL);
+ file = mh_xstrdup(buf);
} else {
/* Relative path. */
- file = cwd ? concat (cwd, "/", buf, NULL) : add (buf, NULL);
+ file = cwd ? concat (cwd, "/", buf, NULL) : mh_xstrdup(buf);
}
check_again = 1;
if (stat (file, &st) == OK) {
/* Keep count of files that would have been clobbered,
and return that as process exit status. */
- advise (NULL, "will not overwrite %s with -clobber never", file);
+ inform("will not overwrite %s with -clobber never", file);
free (file);
file = NULL;
++info->files_not_clobbered;
return file;
}
+static bool use_param_as_filename(const char *p)
+{
+ /* Preserve result of original test that considered an empty string
+ * OK. */
+ return !*p || (!strchr("/.|!", *p) && !strchr(p, '%'));
+}
+
/* -clobber support */
/******************************************************************************/
projects / nmh / blobdiff