1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
$NetBSD: patch-an,v 1.2 2011/10/08 06:17:40 dholland Exp $
- check for hes_getmailhost before using it
- avoid conflict with POSIX getline
--- clients/zmailnotify/zmailnotify.c.orig 1997-10-25 21:47:11.000000000 +0000
+++ clients/zmailnotify/zmailnotify.c
@@ -72,7 +72,7 @@ main(argc, argv)
int i,nbytes,retval,uselock;
struct passwd *pwd;
struct _mail mymail;
-#ifdef HAVE_HESIOD
+#ifdef HAVE_HES_GETMAILHOST
struct hes_postoffice *p;
#endif
@@ -104,7 +104,7 @@ main(argc, argv)
(void) sprintf(lockfile,"%s/.maillock",dir);
host = (char *)getenv("MAILHOST");
-#ifdef HAVE_HESIOD
+#ifdef HAVE_HES_GETMAILHOST
if (host == NULL) {
p = hes_getmailhost(user);
if (p != NULL && strcmp(p->po_type, "POP") == 0)
@@ -144,7 +144,7 @@ main(argc, argv)
exit(1);
}
- if ((getline(response, sizeof response, sfi) != OK) ||
+ if ((get_line(response, sizeof response, sfi) != OK) ||
(*response != '+')) {
fprintf(stderr,"%s: %s\n",prog,response);
exit(1);
@@ -498,7 +498,7 @@ pop_command(fmt, va_alist)
if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK);
- if (getline(buf, sizeof buf, sfi) != OK) {
+ if (get_line(buf, sizeof buf, sfi) != OK) {
(void) strcpy(Errmsg, buf);
return(NOTOK);
}
@@ -519,7 +519,7 @@ int *nmsgs, *nbytes;
if (putline("STAT", Errmsg, sfo) == NOTOK) return(NOTOK);
- if (getline(buf, sizeof buf, sfi) != OK) {
+ if (get_line(buf, sizeof buf, sfi) != OK) {
(void) strcpy(Errmsg, buf);
return(NOTOK);
}
@@ -546,7 +546,7 @@ int (*action)();
#endif
if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK);
- if (getline(buf, sizeof buf, sfi) != OK) {
+ if (get_line(buf, sizeof buf, sfi) != OK) {
(void) strcpy(Errmsg, buf);
return(NOTOK);
}
@@ -565,7 +565,7 @@ int (*action)();
}
}
-getline(buf, n, f)
+get_line(buf, n, f)
char *buf;
register int n;
FILE *f;
@@ -595,7 +595,7 @@ char *buf;
register int n;
FILE *f;
{
- if (getline(buf, n, f) != OK) return (NOTOK);
+ if (get_line(buf, n, f) != OK) return (NOTOK);
if (*buf == '.') {
if (*(buf+1) == '\0') {
return (DONE);
@@ -605,7 +605,7 @@ FILE *f;
} else if (*buf == '\0') {
/* suck up all future lines, since this is after all only for headers */
while(! ((buf[0]=='.') && (buf[1] == '\0')) ) {
- if (getline(buf, n, f) != OK) return (NOTOK);
+ if (get_line(buf, n, f) != OK) return (NOTOK);
}
return DONE;
}
|
