projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refile: Never change the current folder
[mmh]
/
uip
/
pick.c
diff --git
a/uip/pick.c
b/uip/pick.c
index
2d2bd65
..
1df59b1
100644
(file)
--- a/
uip/pick.c
+++ b/
uip/pick.c
@@
-197,7
+197,7
@@
main(int argc, char **argv)
if (folder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
if (folder)
adios(EX_USAGE, NULL, "only one folder at a time!");
else
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-731,7
+731,7
@@
pattern: ;
padvise(NULL, "pattern error in %s %s", argp[-2], cp);
return NULL;
}
padvise(NULL, "pattern error in %s %s", argp[-2], cp);
return NULL;
}
- n->n_patbuf = getcpy(dp);
+ n->n_patbuf = mh_xstrdup(dp);
return n;
case PROTHR:
return n;
case PROTHR:
@@
-768,8
+768,7
@@
newnexus(int (*action)())
{
struct nexus *p;
{
struct nexus *p;
- if ((p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p)) == NULL)
- adios(EX_OSERR, NULL, "unable to allocate component storage");
+ p = mh_xcalloc(1, sizeof *p);
p->n_action = action;
return p;
p->n_action = action;
return p;
@@
-1253,10
+1252,9
@@
plist
case FLD:
case FLDPLUS:
if (bp != NULL) {
case FLD:
case FLDPLUS:
if (bp != NULL) {
- free(bp);
- bp = NULL;
+ mh_free0(&bp);
}
}
- bp = getcpy(buf);
+ bp = mh_xstrdup(buf);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof buf, fp);
while (state == FLDPLUS) {
state = m_getfld(state, name, buf,
sizeof buf, fp);
@@
-1273,7
+1271,7
@@
plist
if (state == LENERR || state == FMTERR)
advise(NULL, "format error in message %d", msgnum);
if (bp != NULL)
if (state == LENERR || state == FMTERR)
advise(NULL, "format error in message %d", msgnum);
if (bp != NULL)
- free(bp);
+ mh_free0(&bp);
return 0;
default:
return 0;
default:
@@
-1290,6
+1288,6
@@
plist
: (twsort(tw, &n->n_tws) < 0);
if (bp != NULL)
: (twsort(tw, &n->n_tws) < 0);
if (bp != NULL)
- free(bp);
+ mh_free0(&bp);
return state;
}
return state;
}