projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the -nomoreproc switch from mhl, show, mhshow.
[mmh]
/
uip
/
sortm.c
diff --git
a/uip/sortm.c
b/uip/sortm.c
index
ffe14f8
..
125991c
100644
(file)
--- a/
uip/sortm.c
+++ b/
uip/sortm.c
@@
-43,7
+43,7
@@
struct smsg {
static struct smsg *smsgs;
int nmsgs;
static struct smsg *smsgs;
int nmsgs;
-char *subjsort = (char *) 0; /* sort on subject if != 0 */
+char *subjsort = NULL; /* sort on subject if != 0 */
unsigned long datelimit = 0;
int submajor = 0; /* if true, sort on subject-major */
int verbose;
unsigned long datelimit = 0;
int submajor = 0; /* if true, sort on subject-major */
int verbose;
@@
-126,7
+126,7
@@
main(int argc, char **argv)
subjsort = "subject";
continue;
case NSUBJSW:
subjsort = "subject";
continue;
case NSUBJSW:
- subjsort = (char *)0;
+ subjsort = NULL;
continue;
case LIMSW:
continue;
case LIMSW:
@@
-159,20
+159,18
@@
main(int argc, char **argv)
if (folder)
adios(NULL, "only one folder at a time!");
else
if (folder)
adios(NULL, "only one folder at a time!");
else
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
- if (!context_find("path"))
- free(path("./", TFOLDER));
if (!msgs.size)
if (!msgs.size)
- app_msgarg(&msgs, "all");
+ app_msgarg(&msgs, seq_all);
if (!datesw)
datesw = "date";
if (!folder)
if (!datesw)
datesw = "date";
if (!folder)
- folder = getfolder(1);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
@@
-279,7
+277,7
@@
main(int argc, char **argv)
rename_msgs(mp, dlist);
rename_msgs(mp, dlist);
- context_replace(pfolder, folder); /* update current folder */
+ context_replace(curfolder, folder); /* update current folder */
seq_save(mp); /* synchronize message sequences */
context_save(); /* save the context file */
folder_free(mp); /* free folder/message structure */
seq_save(mp); /* synchronize message sequences */
context_save(); /* save the context file */
folder_free(mp); /* free folder/message structure */
@@
-564,8
+562,8
@@
rename_msgs(struct msgs *mp, struct smsg **mlist)
** messages in the folder.
*/
** messages in the folder.
*/
- (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old);
- (void)snprintf(newbuf, sizeof (newbuf), "%s/%d",
+ snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old);
+ snprintf(newbuf, sizeof (newbuf), "%s/%d",
mp->foldpath, mp->hghmsg + 1);
ext_hook("ref-hook", f1, newbuf);
mp->foldpath, mp->hghmsg + 1);
ext_hook("ref-hook", f1, newbuf);
@@
-581,7
+579,7
@@
rename_msgs(struct msgs *mp, struct smsg **mlist)
** to the real place.
*/
** to the real place.
*/
- (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new);
+ snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new);
ext_hook("ref-hook", newbuf, f1);
if (rename(tmpfil, m_name(new)) == NOTOK)
ext_hook("ref-hook", newbuf, f1);
if (rename(tmpfil, m_name(new)) == NOTOK)