projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mhmail: Removed hidden -resent and -queued switches.
[mmh]
/
uip
/
rmf.c
diff --git
a/uip/rmf.c
b/uip/rmf.c
index
f214f59
..
9d20752
100644
(file)
--- a/
uip/rmf.c
+++ b/
uip/rmf.c
@@
-12,9
+12,9
@@
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
#define VERSIONSW 2
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 3
{ "help", 0 },
{ NULL, 0 }
#define HELPSW 3
{ "help", 0 },
{ NULL, 0 }
@@
-113,7
+113,7
@@
main(int argc, char **argv)
if (rmf(folder) == OK) {
char *cfolder = context_find(curfolder);
if (rmf(folder) == OK) {
char *cfolder = context_find(curfolder);
- if (cfolder && strcmp(cfolder, newfolder)) {
+ if (cfolder && strcmp(cfolder, newfolder)!=0) {
printf("[+%s now current]\n", newfolder);
/* update current folder */
context_replace(curfolder, newfolder);
printf("[+%s now current]\n", newfolder);
/* update current folder */
context_replace(curfolder, newfolder);
@@
-139,8
+139,8
@@
rmf(char *folder)
break; /* fall otherwise */
case NOTOK:
break; /* fall otherwise */
case NOTOK:
- snprintf(cur, sizeof(cur), "atr-%s-%s",
- current, toabsdir(folder));
+ snprintf(cur, sizeof(cur), "atr-%s-%s", seq_cur,
+ toabsdir(folder));
if (!context_del(cur)) {
printf("[+%s de-referenced]\n", folder);
return OK;
if (!context_del(cur)) {
printf("[+%s de-referenced]\n", folder);
return OK;
@@
-170,21
+170,12
@@
rmf(char *folder)
continue; /* else fall */
case ',':
continue; /* else fall */
case ',':
-#ifdef MHE
- case '+':
-#endif /* MHE */
-#ifdef UCI
- case '_':
- case '#':
-#endif /* UCI */
break;
default:
if (m_atoi(dp->d_name))
break;
break;
default:
if (m_atoi(dp->d_name))
break;
- if (strcmp(dp->d_name, altmsglink) == 0 ||
- strncmp(dp->d_name,
- backup_prefix, j) == 0)
+ if (strncmp(dp->d_name, backup_prefix, j) == 0)
break;
admonish(NULL, "file \"%s/%s\" not deleted",
break;
admonish(NULL, "file \"%s/%s\" not deleted",
@@
-241,7
+232,7
@@
rma(char *folder)
** "atr-something-folderpath", and remove them.
*/
for (np = m_defs, pp = NULL; np; np = np->n_next) {
** "atr-something-folderpath", and remove them.
*/
for (np = m_defs, pp = NULL; np; np = np->n_next) {
- if (isprefix("atr-", np->n_name) &&
+ if (strncmp(np->n_name, "atr-", alen)==0 &&
(j = strlen(np->n_name) - plen) > alen &&
*(np->n_name + j) == '-' &&
strcmp(cp, np->n_name + j + 1) == 0) {
(j = strlen(np->n_name) - plen) > alen &&
*(np->n_name + j) == '-' &&
strcmp(cp, np->n_name + j + 1) == 0) {