Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts on upgrade to pl1.

Browse Source 
sorry, forgot to commit it last night!
This commit is contained in:
itojun 2001-04-03 01:01:08 +00:00
parent f22201f8eb
commit aad2aaeb2d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/dist/postfix/src/global/tok822_parse.c vendored
View File

@ -540,7 +540,7 @@ TOK822 *tok822_scan_addr(const char *addr)
#include <unistd.h>
#include <vstream.h>
#include <vstring_vstream.h>
#include <readlline.h>
/* tok822_print - display token */
@ -577,7 +577,11 @@ int main(int unused_argc, char **unused_argv)
TOK822 *list;
VSTRING *buf = vstring_alloc(100);
while (vstring_fgets_nonl(buf, VSTREAM_IN)) {
while (readlline(buf, VSTREAM_IN, (int *) 0, READLL_KEEPNL)) {
while (VSTRING_LEN(buf) > 0 && vstring_end(buf)[-1] == '\n') {
vstring_end(buf)[-1] = 0;
vstring_truncate(buf, VSTRING_LEN(buf) - 1);
}
if (!isatty(vstream_fileno(VSTREAM_IN)))
vstream_printf(">>>%s<<<\n\n", vstring_str(buf));
list = tok822_parse(vstring_str(buf));

6
gnu/dist/postfix/src/util/sys_defs.h vendored
View File

@ -333,10 +333,12 @@ extern int opterr;
#define USE_STATVFS
#define STATVFS_IN_SYS_STATVFS_H
#define STRCASECMP_IN_STRINGS_H
#if 0
extern time_t time(time_t *);
extern int seteuid(uid_t);
extern int setegid(gid_t);
extern int initgroups(const char *, int);
#endif
#endif
@ -403,6 +405,10 @@ extern int initgroups(const char *, int);
#if defined(IRIX5)
#define MISSING_USLEEP
#endif
#if defined(IRIX6)
#define HAS_POSIX_REGEXP
#endif
/*