projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* mh_xmalloc(), mh_xrealloc(), pwd(): Add comments describing the purpose
[mmh]
/
uip
/
pick.c
diff --git
a/uip/pick.c
b/uip/pick.c
index
65a9091
..
8cdfa58
100644
(file)
--- a/
uip/pick.c
+++ b/
uip/pick.c
@@
-12,6
+12,7
@@
#include <h/mh.h>
#include <h/tws.h>
#include <h/picksbr.h>
#include <h/mh.h>
#include <h/tws.h>
#include <h/picksbr.h>
+#include <h/utils.h>
/*
* We allocate space for messages (msgs array)
/*
* We allocate space for messages (msgs array)
@@
-72,7
+73,7
@@
static struct swit switches[] = {
{ NULL, 0 }
};
{ NULL, 0 }
};
-static int listsw = 0;
+static int listsw = -1;
int
int
@@
-103,8
+104,7
@@
main (int argc, char **argv)
*/
nummsgs = 0;
maxmsgs = MAXMSGS;
*/
nummsgs = 0;
maxmsgs = MAXMSGS;
- if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
- adios (NULL, "unable to allocate storage");
+ msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
while ((cp = *argp++)) {
if (*cp == '-') {
while ((cp = *argp++)) {
if (*cp == '-') {
@@
-115,6
+115,7
@@
main (int argc, char **argv)
switch (smatch (cp, switches)) {
case AMBIGSW:
ambigsw (cp, switches);
switch (smatch (cp, switches)) {
case AMBIGSW:
ambigsw (cp, switches);
+ listsw = 0; /* HACK */
done (1);
case UNKWNSW:
adios (NULL, "-%s unknown", cp);
done (1);
case UNKWNSW:
adios (NULL, "-%s unknown", cp);
@@
-127,6
+128,7
@@
main (int argc, char **argv)
done (1);
case VERSIONSW:
print_version(invo_name);
done (1);
case VERSIONSW:
print_version(invo_name);
+ listsw = 0; /* HACK */
done (1);
case CCSW:
done (1);
case CCSW:
@@
-163,7
+165,6
@@
main (int argc, char **argv)
if (seqp >= NUMATTRS)
adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
seqs[seqp++] = cp;
if (seqp >= NUMATTRS)
adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
seqs[seqp++] = cp;
- listsw = 0;
continue;
case PUBLSW:
publicsw = 1;
continue;
case PUBLSW:
publicsw = 1;
@@
-179,7
+180,7
@@
main (int argc, char **argv)
continue;
case LISTSW:
continue;
case LISTSW:
- listsw++;
+ listsw = 1;
continue;
case NLISTSW:
listsw = 0;
continue;
case NLISTSW:
listsw = 0;
@@
-198,9
+199,8
@@
main (int argc, char **argv)
*/
if (nummsgs >= maxmsgs) {
maxmsgs += MAXMSGS;
*/
if (nummsgs >= maxmsgs) {
maxmsgs += MAXMSGS;
- if (!(msgs = (char **) realloc (msgs,
- (size_t) (maxmsgs * sizeof(*msgs)))))
- adios (NULL, "unable to reallocate msgs storage");
+ msgs = (char **) mh_xrealloc (msgs,
+ (size_t) (maxmsgs * sizeof(*msgs)));
}
msgs[nummsgs++] = cp;
}
}
msgs[nummsgs++] = cp;
}
@@
-240,10
+240,10
@@
main (int argc, char **argv)
/*
* If we aren't saving the results to a sequence,
/*
* If we aren't saving the results to a sequence,
- * we need to list the results.
+ * we default to list the results.
*/
*/
- if (seqp == 0)
- listsw++;
+ if (listsw == -1)
+ listsw = !seqp;
if (publicsw == 1 && is_readonly(mp))
adios (NULL, "folder %s is read-only, so -public not allowed", folder);
if (publicsw == 1 && is_readonly(mp))
adios (NULL, "folder %s is read-only, so -public not allowed", folder);