Deleted Added
sdiff udiff text old ( 122135 ) new ( 122141 )
full compact
mtree.c (122135) mtree.c (122141)
1/*-
2 * Copyright (c) 1989, 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 25 unchanged lines hidden (view full) ---

34 The Regents of the University of California. All rights reserved.\n";
35#endif /* not lint */
36
37#ifndef lint
38static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
39#endif /* not lint */
40#endif
41#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1989, 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 25 unchanged lines hidden (view full) ---

34 The Regents of the University of California. All rights reserved.\n";
35#endif /* not lint */
36
37#ifndef lint
38static char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93";
39#endif /* not lint */
40#endif
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/usr.sbin/mtree/mtree.c 122135 2003-11-05 20:07:40Z phk $");
42__FBSDID("$FreeBSD: head/usr.sbin/mtree/mtree.c 122141 2003-11-05 22:26:08Z phk $");
43
44#include <sys/param.h>
45#include <sys/stat.h>
46#include <err.h>
47#include <errno.h>
48#include <fts.h>
49#include <stdio.h>
50#include <unistd.h>

--- 8 unchanged lines hidden (view full) ---

59static void usage(void);
60
61int
62main(int argc, char *argv[])
63{
64 int ch;
65 char *dir, *p;
66 int status;
43
44#include <sys/param.h>
45#include <sys/stat.h>
46#include <err.h>
47#include <errno.h>
48#include <fts.h>
49#include <stdio.h>
50#include <unistd.h>

--- 8 unchanged lines hidden (view full) ---

59static void usage(void);
60
61int
62main(int argc, char *argv[])
63{
64 int ch;
65 char *dir, *p;
66 int status;
67 FILE *spec1, *spec2;
67
68 dir = NULL;
69 keys = KEYDEFAULT;
70 init_excludes();
68
69 dir = NULL;
70 keys = KEYDEFAULT;
71 init_excludes();
72 spec1 = stdin;
73 spec2 = NULL;
71
72 while ((ch = getopt(argc, argv, "cdef:iK:k:LnPp:qrs:UuxX:")) != -1)
73 switch((char)ch) {
74 case 'c':
75 cflag = 1;
76 break;
77 case 'd':
78 dflag = 1;
79 break;
80 case 'e':
81 eflag = 1;
82 break;
83 case 'f':
74
75 while ((ch = getopt(argc, argv, "cdef:iK:k:LnPp:qrs:UuxX:")) != -1)
76 switch((char)ch) {
77 case 'c':
78 cflag = 1;
79 break;
80 case 'd':
81 dflag = 1;
82 break;
83 case 'e':
84 eflag = 1;
85 break;
86 case 'f':
84 if (!(freopen(optarg, "r", stdin)))
85 err(1, "%s", optarg);
87 if (spec1 == stdin) {
88 spec1 = fopen(optarg, "r");
89 if (spec1 == NULL)
90 err(1, "%s", optarg);
91 } else if (spec2 == NULL) {
92 spec2 = fopen(optarg, "r");
93 if (spec2 == NULL)
94 err(1, "%s", optarg);
95 } else
96 usage();
86 break;
87 case 'i':
88 iflag = 1;
89 break;
90 case 'K':
91 while ((p = strsep(&optarg, " \t,")) != NULL)
92 if (*p != '\0')
93 keys |= parsekey(p, NULL);

--- 58 unchanged lines hidden (view full) ---

152
153 if ((cflag || sflag) && !getwd(fullpath))
154 errx(1, "%s", fullpath);
155
156 if (cflag) {
157 cwalk();
158 exit(0);
159 }
97 break;
98 case 'i':
99 iflag = 1;
100 break;
101 case 'K':
102 while ((p = strsep(&optarg, " \t,")) != NULL)
103 if (*p != '\0')
104 keys |= parsekey(p, NULL);

--- 58 unchanged lines hidden (view full) ---

163
164 if ((cflag || sflag) && !getwd(fullpath))
165 errx(1, "%s", fullpath);
166
167 if (cflag) {
168 cwalk();
169 exit(0);
170 }
160 status = mtree_verifyspec(stdin);
171 if (spec2 != NULL)
172 status = mtree_specspec(spec1, spec2);
173 else
174 status = mtree_verifyspec(spec1);
161 if (Uflag & (status == MISMATCHEXIT))
162 status = 0;
163 exit(status);
164}
165
166static void
167usage(void)
168{
169 (void)fprintf(stderr,
175 if (Uflag & (status == MISMATCHEXIT))
176 status = 0;
177 exit(status);
178}
179
180static void
181usage(void)
182{
183 (void)fprintf(stderr,
170"usage: mtree [-LPUcdeinqrux] [-f spec] [-K key] [-k key] [-p path] [-s seed]\n"
184"usage: mtree [-LPUcdeinqrux] [-f spec] [-f spec] [-K key] [-k key] [-p path] [-s seed]\n"
171"\t[-X excludes]\n");
172 exit(1);
173}
185"\t[-X excludes]\n");
186 exit(1);
187}