projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Supress progress meter if non-interactive.
[mmh]
/
uip
/
rmf.c
diff --git
a/uip/rmf.c
b/uip/rmf.c
index
b9c1969
..
a0c68a3
100644
(file)
--- a/
uip/rmf.c
+++ b/
uip/rmf.c
@@
-12,7
+12,7
@@
static struct swit switches[] = {
#define INTRSW 0
{ "interactive", 0 },
#define NINTRSW 1
#define INTRSW 0
{ "interactive", 0 },
#define NINTRSW 1
- { "nointeractive", 0 },
+ { "nointeractive", 2 },
#define VERSIONSW 2
{ "Version", 0 },
#define HELPSW 3
#define VERSIONSW 2
{ "Version", 0 },
#define HELPSW 3
@@
-34,9
+34,7
@@
main(int argc, char **argv)
char *cp, *folder = NULL, newfolder[BUFSIZ];
char buf[BUFSIZ], **argp, **arguments;
char *cp, *folder = NULL, newfolder[BUFSIZ];
char buf[BUFSIZ], **argp, **arguments;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-127,7
+125,7
@@
main(int argc, char **argv)
static int
rmf(char *folder)
{
static int
rmf(char *folder)
{
- int i, j, others;
+ int i, others;
register char *maildir;
char cur[BUFSIZ];
register struct dirent *dp;
register char *maildir;
char cur[BUFSIZ];
register struct dirent *dp;
@@
-161,7
+159,6
@@
rmf(char *folder)
ext_hook("del-hook", maildir, NULL);
ext_hook("del-hook", maildir, NULL);
- j = strlen(backup_prefix);
while ((dp = readdir(dd))) {
switch (dp->d_name[0]) {
case '.':
while ((dp = readdir(dd))) {
switch (dp->d_name[0]) {
case '.':
@@
-175,10
+172,6
@@
rmf(char *folder)
default:
if (m_atoi(dp->d_name))
break;
default:
if (m_atoi(dp->d_name))
break;
- if (strcmp(dp->d_name, altmsglink) == 0 ||
- strncmp(dp->d_name,
- backup_prefix, j) == 0)
- break;
admonish(NULL, "file \"%s/%s\" not deleted",
folder, dp->d_name);
admonish(NULL, "file \"%s/%s\" not deleted",
folder, dp->d_name);