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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
--- diffdir.c.orig 1991-11-12 20:31:29 UTC
+++ diffdir.c
@@ -24,7 +24,15 @@ struct dir *setupdir();
int header;
char title[2*BUFSIZ], *etitle;
-diffdir(argv)
+/* declarations */
+void only(struct dir *, int);
+void compare(register struct dir *);
+void scanpr(register struct dir *, int, char *, char *, char *, char *, char *);
+void calldiff(char *);
+int ascii(int);
+int entcmp(const void *, const void *);
+
+void diffdir(argv)
char **argv;
{
register struct dir *d1, *d2;
@@ -112,7 +120,7 @@ diffdir(argv)
}
}
-setfile(fpp, epp, file)
+void setfile(fpp, epp, file)
char **fpp, **epp;
char *file;
{
@@ -130,7 +138,7 @@ setfile(fpp, epp, file)
*epp = cp;
}
-scanpr(dp, test, title, file1, efile1, file2, efile2)
+void scanpr(dp, test, title, file1, efile1, file2, efile2)
register struct dir *dp;
int test;
char *title, *file1, *efile1, *file2, *efile2;
@@ -155,24 +163,23 @@ scanpr(dp, test, title, file1, efile1, file2, efile2)
}
}
-only(dp, which)
+void only(dp, which)
struct dir *dp;
int which;
{
char *file = which == 1 ? file1 : file2;
char *efile = which == 1 ? efile1 : efile2;
- printf("Only in %.*s: %s\n", efile - file - 1, file, dp->d_entry);
+ printf("Only in %.*s: %s\n", (int)(efile - file - 1),
+ file, dp->d_entry);
}
-int entcmp();
-
struct dir *
setupdir(cp)
char *cp;
{
register struct dir *dp = 0, *ep;
- register struct direct *rp;
+ register struct dirent *rp;
register int nitems, n;
DIR *dirp;
@@ -196,7 +203,7 @@ setupdir(cp)
fprintf(stderr, "diff: ran out of memory\n");
done();
}
- while (rp = readdir(dirp)) {
+ while ((rp = readdir(dirp))) {
ep = &dp[nitems++];
ep->d_reclen = rp->d_reclen;
ep->d_namlen = rp->d_namlen;
@@ -225,13 +232,13 @@ setupdir(cp)
return (dp);
}
-entcmp(d1, d2)
- struct dir *d1, *d2;
+int entcmp(d1, d2)
+ const void *d1, *d2;
{
- return (strcmp(d1->d_entry, d2->d_entry));
+ return strcmp(((struct dir *)d1)->d_entry, ((struct dir *)d2)->d_entry);
}
-compare(dp)
+void compare(dp)
register struct dir *dp;
{
register int i, j;
@@ -323,7 +330,7 @@ closem:
char *prargs[] = { "pr", "-h", 0, "-f", 0, 0 };
-calldiff(wantpr)
+void calldiff(wantpr)
char *wantpr;
{
int pid, status, status2, pv[2];
@@ -382,7 +389,7 @@ calldiff(wantpr)
#include <a.out.h>
-ascii(f)
+int ascii(f)
int f;
{
char buf[BUFSIZ];
@@ -407,7 +414,7 @@ ascii(f)
/*
* THIS IS CRUDE.
*/
-useless(cp)
+int useless(cp)
register char *cp;
{
|
