projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add uip/whatnow2 to .gitignore
[mmh]
/
uip
/
folder.c
diff --git
a/uip/folder.c
b/uip/folder.c
index
c8b3c60
..
3e3cd76
100644
(file)
--- a/
uip/folder.c
+++ b/
uip/folder.c
@@
-231,7
+231,7
@@
main(int argc, char **argv)
if (argfolder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
if (argfolder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
- argfolder = getcpy(expandfol(cp));
+ argfolder = mh_xstrdup(expandfol(cp));
} else {
if (msg)
adios(EX_USAGE, NULL, "only one (current) message at a time!");
} else {
if (msg)
adios(EX_USAGE, NULL, "only one (current) message at a time!");
@@
-255,13
+255,13
@@
main(int argc, char **argv)
/* If no folder is given, the current folder and */
/* the top of the folder stack are swapped. */
if ((cp = context_find(stack))) {
/* If no folder is given, the current folder and */
/* the top of the folder stack are swapped. */
if ((cp = context_find(stack))) {
- dp = getcpy(cp);
+ dp = mh_xstrdup(cp);
ap = brkstring(dp, " ", "\n");
ap = brkstring(dp, " ", "\n");
- argfolder = getcpy(*ap++);
+ argfolder = mh_xstrdup(*ap++);
} else {
adios(EX_USAGE, NULL, "no other folder");
}
} else {
adios(EX_USAGE, NULL, "no other folder");
}
- for (cp = getcpy(getcurfol()); *ap; ap++)
+ for (cp = mh_xstrdup(getcurfol()); *ap; ap++)
cp = add(*ap, add(" ", cp));
mh_free0(&dp);
context_replace(stack, cp); /* update folder stack */
cp = add(*ap, add(" ", cp));
mh_free0(&dp);
context_replace(stack, cp); /* update folder stack */
@@
-269,7
+269,7
@@
main(int argc, char **argv)
/* update folder stack */
context_replace(stack, (cp = context_find (stack)) ?
concat(getcurfol(), " ", cp, NULL) :
/* update folder stack */
context_replace(stack, (cp = context_find (stack)) ?
concat(getcurfol(), " ", cp, NULL) :
- getcpy(getcurfol()));
+ mh_xstrdup(getcurfol()));
}
}
}
}
@@
-278,15
+278,15
@@
main(int argc, char **argv)
if (argfolder)
adios(EX_USAGE, NULL, "sorry, no folders allowed with -pop");
if ((cp = context_find(stack))) {
if (argfolder)
adios(EX_USAGE, NULL, "sorry, no folders allowed with -pop");
if ((cp = context_find(stack))) {
- dp = getcpy(cp);
+ dp = mh_xstrdup(cp);
ap = brkstring(dp, " ", "\n");
ap = brkstring(dp, " ", "\n");
- argfolder = getcpy(*ap++);
+ argfolder = mh_xstrdup(*ap++);
} else {
adios(EX_DATAERR, NULL, "folder stack empty");
}
if (*ap) {
/* if there's anything left in the stack */
} else {
adios(EX_DATAERR, NULL, "folder stack empty");
}
if (*ap) {
/* if there's anything left in the stack */
- cp = getcpy(*ap++);
+ cp = mh_xstrdup(*ap++);
for (; *ap; ap++)
cp = add(*ap, add(" ", cp));
context_replace(stack, cp); /* update folder stack */
for (; *ap; ap++)
cp = add(*ap, add(" ", cp));
context_replace(stack, cp); /* update folder stack */
@@
-310,7
+310,7
@@
main(int argc, char **argv)
if (listsw) {
printf("%s", argfolder ? argfolder : getcurfol());
if ((cp = context_find(stack))) {
if (listsw) {
printf("%s", argfolder ? argfolder : getcurfol());
if ((cp = context_find(stack))) {
- dp = getcpy(cp);
+ dp = mh_xstrdup(cp);
for (ap = brkstring(dp, " ", "\n"); *ap; ap++)
printf(" %s", *ap);
mh_free0(&dp);
for (ap = brkstring(dp, " ", "\n"); *ap; ap++)
printf(" %s", *ap);
mh_free0(&dp);