projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hesiod and krb5 test changes. add --with-locking to INSTALL
[mmh]
/
uip
/
picksbr.c
diff --git
a/uip/picksbr.c
b/uip/picksbr.c
index
88463ed
..
ebebf6c
100644
(file)
--- a/
uip/picksbr.c
+++ b/
uip/picksbr.c
@@
-6,9
+6,20
@@
*/
#include <h/mh.h>
*/
#include <h/mh.h>
-#include <zotnet/tws/tws.h>
+#include <h/tws.h>
#include <h/picksbr.h>
#include <h/picksbr.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef TM_IN_SYS_TIME
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
static struct swit parswit[] = {
#define PRAND 0
{ "and", 0 },
static struct swit parswit[] = {
#define PRAND 0
{ "and", 0 },
@@
-641,14
+652,15
@@
plist
ebp = ibuf + strlen (ibuf);
}
c = *p2++;
ebp = ibuf + strlen (ibuf);
}
c = *p2++;
- if (lf && c != '\n')
+ if (lf && c != '\n') {
if (c != ' ' && c != '\t') {
--p2;
break;
}
else
lf = 0;
if (c != ' ' && c != '\t') {
--p2;
break;
}
else
lf = 0;
- if (c == '\n')
+ }
+ if (c == '\n') {
if (body)
break;
else {
if (body)
break;
else {
@@
-659,6
+671,7
@@
plist
lf++;
c = ' ';
}
lf++;
c = ' ';
}
+ }
if (c && p1 < &linebuf[LBSIZE - 1])
*p1++ = c;
}
if (c && p1 < &linebuf[LBSIZE - 1])
*p1++ = c;
}
@@
-677,7
+690,7
@@
plist
if (*p2 == CCHR) {
c = p2[1];
do {
if (*p2 == CCHR) {
c = p2[1];
do {
- if (*p1 == c || cc[*p1] == c)
+ if (*p1 == c || cc[(unsigned char)*p1] == c)
if (advance (p1, p2))
return 1;
} while (*p1++);
if (advance (p1, p2))
return 1;
} while (*p1++);
@@
-702,7
+715,7
@@
advance (char *alp, char *aep)
for (;;)
switch (*ep++) {
case CCHR:
for (;;)
switch (*ep++) {
case CCHR:
- if (*ep++ == *lp++ || ep[-1] == cc[lp[-1]])
+ if (*ep++ == *lp++ || ep[-1] == cc[(unsigned char)lp[-1]])
continue;
return 0;
continue;
return 0;
@@
-741,7
+754,7
@@
advance (char *alp, char *aep)
case CCHR | STAR:
curlp = lp;
case CCHR | STAR:
curlp = lp;
- while (*lp++ == *ep || cc[lp[-1]] == *ep)
+ while (*lp++ == *ep || cc[(unsigned char)lp[-1]] == *ep)
continue;
ep++;
goto star;
continue;
ep++;
goto star;