X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a753601a3811c10e433dbb04d8211a3df4b99012..ec173fd2c:/uip/rcvstore.c?ds=sidebyside diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 7b15491f..58dba169 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -1,46 +1,58 @@ - -/* - * rcvstore.c -- asynchronously add mail to a folder - * - * $Id$ +/* rcvstore.c -- asynchronously add mail to a folder * * 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/getarguments.h" +#include "sbr/seq_setunseen.h" +#include "sbr/seq_save.h" +#include "sbr/smatch.h" +#include "sbr/cpydata.h" +#include "sbr/getfolder.h" +#include "sbr/folder_read.h" +#include "sbr/folder_free.h" +#include "sbr/folder_addmsg.h" +#include "sbr/context_save.h" +#include "sbr/context_find.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/seq_add.h" +#include "sbr/error.h" #include -#include -#include -#include -#include - -static struct swit switches[] = { -#define CRETSW 0 - { "create", 0 }, -#define NCRETSW 1 - { "nocreate", 0 }, -#define UNSEENSW 2 - { "unseen", 0 }, -#define NUNSEENSW 3 - { "nounseen", 0 }, -#define PUBSW 4 - { "public", 0 }, -#define NPUBSW 5 - { "nopublic", 0 }, -#define ZEROSW 6 - { "zero", 0 }, -#define NZEROSW 7 - { "nozero", 0 }, -#define SEQSW 8 - { "sequence name", 0 }, -#define VERSIONSW 9 - { "version", 0 }, -#define HELPSW 10 - { "help", 0 }, - { NULL, 0 } -}; +#include "h/signals.h" +#include "h/mts.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" +#include "sbr/makedir.h" + +#define RCVSTORE_SWITCHES \ + X("create", 0, CRETSW) \ + X("nocreate", 0, NCRETSW) \ + X("unseen", 0, UNSEENSW) \ + X("nounseen", 0, NUNSEENSW) \ + X("public", 0, PUBSW) \ + X("nopublic", 0, NPUBSW) \ + X("zero", 0, ZEROSW) \ + X("nozero", 0, NZEROSW) \ + X("sequence name", 0, SEQSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(RCVSTORE); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(RCVSTORE, switches); +#undef X /* @@ -48,27 +60,28 @@ static struct swit switches[] = { */ static char *tmpfilenam = NULL; +static void unlink_done(int) NORETURN; int main (int argc, char **argv) { - int publicsw = -1, zerosw = 0; - int create = 1, unseensw = 1; - int fd, msgnum, seqp = 0; + int publicsw = -1; + bool zerosw = false; + bool create = true; + bool unseensw = true; + int fd, msgnum; + size_t seqp = 0; char *cp, *maildir, *folder = NULL, buf[BUFSIZ]; - char **argp, **arguments, *seqs[NUMATTRS+1]; + char **argp, **arguments; + svector_t seqs = svector_create (0); struct msgs *mp; struct stat st; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + if (nmh_init(argv[0], true, false)) { return 1; } - /* read user profile/context */ - context_read(); + set_done(unlink_done); - mts_init (invo_name); + mts_init (); arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -80,32 +93,30 @@ main (int argc, char **argv) ambigsw (cp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + die("-%s unknown", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case SEQSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument name to %s", argp[-2]); + die("missing argument name to %s", argp[-2]); - /* check if too many sequences specified */ - if (seqp >= NUMATTRS) - adios (NULL, "too many sequences (more than %d) specified", NUMATTRS); - seqs[seqp++] = cp; + svector_push_back (seqs, cp); + seqp++; continue; case UNSEENSW: - unseensw = 1; + unseensw = true; continue; case NUNSEENSW: - unseensw = 0; + unseensw = false; continue; case PUBSW: @@ -116,32 +127,29 @@ main (int argc, char **argv) continue; case ZEROSW: - zerosw++; + zerosw = true; continue; case NZEROSW: - zerosw = 0; + zerosw = false; continue; case CRETSW: - create++; + create = true; continue; case NCRETSW: - create = 0; + create = false; continue; } } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); - else - folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF); + die("only one folder at a time!"); + folder = pluspath (cp); } else { - adios (NULL, "usage: %s [+folder] [switches]", invo_name); + die("usage: %s [+folder] [switches]", invo_name); } } - seqs[seqp] = NULL; /* NULL terminate list of sequences */ - if (!context_find ("path")) free (path ("./", TFOLDER)); @@ -155,9 +163,9 @@ main (int argc, char **argv) if (errno != ENOENT) adios (maildir, "error on folder"); if (!create) - adios (NULL, "folder %s doesn't exist", maildir); + die("folder %s doesn't exist", maildir); if (!makedir (maildir)) - adios (NULL, "unable to create folder %s", maildir); + die("unable to create folder %s", maildir); } if (chdir (maildir) == NOTOK) @@ -170,16 +178,17 @@ main (int argc, char **argv) SIGNAL (SIGTERM, SIG_IGN); /* create a temporary file */ - tmpfilenam = m_scratch ("", invo_name); - if ((fd = creat (tmpfilenam, m_gmprot ())) == NOTOK) - adios (tmpfilenam, "unable to create"); + tmpfilenam = m_mktemp (invo_name, &fd, NULL); + if (tmpfilenam == NULL) { + die("unable to create temporary file in %s", get_temp_dir()); + } chmod (tmpfilenam, m_gmprot()); /* copy the message from stdin into temp file */ cpydata (fileno (stdin), fd, "standard input", tmpfilenam); if (fstat (fd, &st) == NOTOK) { - unlink (tmpfilenam); + (void) m_unlink (tmpfilenam); adios (tmpfilenam, "unable to fstat"); } if (close (fd) == NOTOK) @@ -187,52 +196,58 @@ main (int argc, char **argv) /* don't add file if it is empty */ if (st.st_size == 0) { - unlink (tmpfilenam); - advise (NULL, "empty file"); + (void) m_unlink (tmpfilenam); + inform("empty file"); done (0); } /* * read folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read (folder, 1))) + die("unable to read folder %s", folder); /* * Link message into folder, and possibly add * to the Unseen-Sequence's. */ - if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0, 0, (char *)0)) == -1) + if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0, 0, NULL)) == -1) done (1); /* * Add the message to any extra sequences * that have been specified. */ - for (seqp = 0; seqs[seqp]; seqp++) { - if (!seq_addmsg (mp, seqs[seqp], msgnum, publicsw, zerosw)) - done (1); + if (seqp) { + /* The only reason that seqp was checked to be non-zero is in + case a -nosequence switch is added. */ + for (seqp = 0; seqp < svector_size (seqs); seqp++) { + if (!seq_addmsg (mp, svector_at (seqs, seqp), msgnum, publicsw, + zerosw)) + done (1); + } } + svector_free (seqs); seq_setunseen (mp, 0); /* synchronize any Unseen-Sequence's */ seq_save (mp); /* synchronize and save message sequences */ folder_free (mp); /* free folder/message structure */ context_save (); /* save the global context file */ - unlink (tmpfilenam); /* remove temporary file */ + (void) m_unlink (tmpfilenam); /* remove temporary file */ tmpfilenam = NULL; - return done (0); + done (0); + return 1; } /* * Clean up and exit */ -int -done(int status) +static void NORETURN +unlink_done(int status) { if (tmpfilenam && *tmpfilenam) - unlink (tmpfilenam); + (void) m_unlink (tmpfilenam); exit (status); - return 1; /* dead code to satisfy the compiler */ }