projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed description of n with mhstore -clobber auto/suffix.
[mmh]
/
uip
/
mhstore.c
diff --git
a/uip/mhstore.c
b/uip/mhstore.c
index
08891f5
..
fa30e03
100644
(file)
--- a/
uip/mhstore.c
+++ b/
uip/mhstore.c
@@
-2,8
+2,6
@@
/*
* mhstore.c -- store the contents of MIME messages
*
/*
* mhstore.c -- store the contents of MIME messages
*
- * $Id$
- *
* 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.
* 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.
@@
-22,10
+20,6
@@
#include <h/mhcachesbr.h>
#include <h/utils.h>
#include <h/mhcachesbr.h>
#include <h/utils.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
static struct swit switches[] = {
#define AUTOSW 0
{ "auto", 0 },
static struct swit switches[] = {
#define AUTOSW 0
{ "auto", 0 },
@@
-53,18
+47,22
@@
static struct swit switches[] = {
{ "version", 0 },
#define HELPSW 12
{ "help", 0 },
{ "version", 0 },
#define HELPSW 12
{ "help", 0 },
+#define CLOBBERSW 13
+ { "clobber always|auto|suffix|ask|never", 0 },
/*
* switches for debugging
*/
/*
* switches for debugging
*/
-#define DEBUGSW 13
+#define DEBUGSW 14
{ "debug", -5 },
{ NULL, 0 }
};
{ "debug", -5 },
{ NULL, 0 }
};
+int save_clobber_policy (const char *);
+extern int files_not_clobbered;
+
/* mhparse.c */
/* mhparse.c */
-extern int checksw;
extern char *tmp; /* directory to place temp files */
/* mhcachesbr.c */
extern char *tmp; /* directory to place temp files */
/* mhcachesbr.c */
@@
-87,9
+85,6
@@
extern int userrs;
int debugsw = 0;
int verbosw = 0;
int debugsw = 0;
int verbosw = 0;
-/* The list of top-level contents to display */
-CT *cts = NULL;
-
#define quitser pipeser
/* mhparse.c */
#define quitser pipeser
/* mhparse.c */
@@
-98,7
+93,6
@@
CT parse_mime (char *);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
/* mhmisc.c */
int part_ok (CT, int);
int type_ok (CT, int);
-void set_endian (void);
void flush_errors (void);
/* mhstoresbr.c */
void flush_errors (void);
/* mhstoresbr.c */
@@
-106,11
+100,13
@@
void store_all_messages (CT *);
/* mhfree.c */
void free_content (CT);
/* mhfree.c */
void free_content (CT);
+extern CT *cts;
+void freects_done (int) NORETURN;
/*
* static prototypes
*/
/*
* static prototypes
*/
-static RETSIGTYPE pipeser (int);
+static void pipeser (int);
int
int
@@
-125,6
+121,8
@@
main (int argc, char **argv)
CT ct, *ctp;
FILE *fp;
CT ct, *ctp;
FILE *fp;
+ done=freects_done;
+
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
@@
-152,10
+150,10
@@
main (int argc, char **argv)
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
invo_name);
print_help (buf, switches, 1);
snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ done (0);
case AUTOSW:
autosw++;
case AUTOSW:
autosw++;
@@
-220,6
+218,14
@@
do_cache:
case NVERBSW:
verbosw = 0;
continue;
case NVERBSW:
verbosw = 0;
continue;
+ case CLOBBERSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios (NULL, "missing argument to %s", argp[-2]);
+ if (save_clobber_policy (cp)) {
+ adios (NULL, "invalid argument, %s, to %s", argp[-1],
+ argp[-2]);
+ }
+ continue;
case DEBUGSW:
debugsw = 1;
continue;
case DEBUGSW:
debugsw = 1;
continue;
@@
-229,7
+235,7
@@
do_cache:
if (folder)
adios (NULL, "only one folder at a time!");
else
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-238,8
+244,6
@@
do_cache:
parts[npart] = NULL;
types[ntype] = NULL;
parts[npart] = NULL;
types[ntype] = NULL;
- set_endian ();
-
/*
* Check if we've specified an additional profile
*/
/*
* Check if we've specified an additional profile
*/
@@
-298,7
+302,7
@@
do_cache:
adios (NULL, "out of memory");
ctp = cts;
adios (NULL, "out of memory");
ctp = cts;
- if ((ct = parse_mime (file)));
+ if ((ct = parse_mime (file)))
*ctp++ = ct;
} else {
/*
*ctp++ = ct;
} else {
/*
@@
-384,11
+388,12
@@
do_cache:
context_save (); /* save the context file */
}
context_save (); /* save the context file */
}
- return done (0);
+ done (files_not_clobbered);
+ return 1;
}
}
-static RETSIGTYPE
+static void
pipeser (int i)
{
if (i == SIGQUIT) {
pipeser (int i)
{
if (i == SIGQUIT) {
@@
-401,17
+406,3
@@
pipeser (int i)
done (1);
/* NOTREACHED */
}
done (1);
/* NOTREACHED */
}
-
-
-int
-done (int status)
-{
- CT *ctp;
-
- if ((ctp = cts))
- for (; *ctp; ctp++)
- free_content (*ctp);
-
- exit (status);
- return 1; /* dead code to satisfy the compiler */
-}