Deleted Added
sdiff udiff text old ( 74652 ) new ( 89791 )
full compact
fsdbutil.c (74652) fsdbutil.c (89791)
1/* $NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $ */
2
3/*
4 * Copyright (c) 1995 John T. Kohl
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
27 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 * POSSIBILITY OF SUCH DAMAGE.
29 */
30
31#ifndef lint
32static const char rcsid[] =
1/* $NetBSD: fsdbutil.c,v 1.2 1995/10/08 23:18:12 thorpej Exp $ */
2
3/*
4 * Copyright (c) 1995 John T. Kohl
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
26 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
27 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 * POSSIBILITY OF SUCH DAMAGE.
29 */
30
31#ifndef lint
32static const char rcsid[] =
33 "$FreeBSD: head/sbin/fsdb/fsdbutil.c 74652 2001-03-22 13:19:32Z roberto $";
33 "$FreeBSD: head/sbin/fsdb/fsdbutil.c 89791 2002-01-25 18:31:57Z green $";
34#endif /* not lint */
35
36#include <sys/param.h>
37#include <ctype.h>
38#include <err.h>
39#include <grp.h>
40#include <pwd.h>
41#include <string.h>

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

62 argv[i] = val;
63 else
64 break;
65 }
66 *argc = i;
67 return argv;
68}
69
34#endif /* not lint */
35
36#include <sys/param.h>
37#include <ctype.h>
38#include <err.h>
39#include <grp.h>
40#include <pwd.h>
41#include <string.h>

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

62 argv[i] = val;
63 else
64 break;
65 }
66 *argc = i;
67 return argv;
68}
69
70char **
71recrack(line, argc, argc_max)
72 char *line;
73 int *argc;
74 int argc_max;
75{
76 static char *argv[8];
77 int i;
78 char *p, *val;
79 for (p = line, i = 0; p != NULL && i < 8 && i < argc_max - 1; i++) {
80 while ((val = strsep(&p, " \t\n")) != NULL && *val == '\0')
81 /**/;
82 if (val)
83 argv[i] = val;
84 else
85 break;
86 }
87 argv[i] = argv[i - 1] + strlen(argv[i - 1]) + 1;
88 argv[i][strcspn(argv[i], "\n")] = '\0';
89 *argc = i + 1;
90 printf("returning with argc %u\n", *argc);
91 return argv;
92}
93
70int
71argcount(cmdp, argc, argv)
72 struct cmdtable *cmdp;
73 int argc;
74 char *argv[];
75{
76 if (cmdp->minargc == cmdp->maxargc)
94int
95argcount(cmdp, argc, argv)
96 struct cmdtable *cmdp;
97 int argc;
98 char *argv[];
99{
100 if (cmdp->minargc == cmdp->maxargc)
77 warnx("command `%s' takes %u arguments", cmdp->cmd, cmdp->minargc-1);
101 warnx("command `%s' takes %u arguments, got %u", cmdp->cmd,
102 cmdp->minargc-1, argc);
78 else
79 warnx("command `%s' takes from %u to %u arguments",
80 cmdp->cmd, cmdp->minargc-1, cmdp->maxargc-1);
81
82 warnx("usage: %s: %s", cmdp->cmd, cmdp->helptxt);
83 return 1;
84}
85

--- 118 unchanged lines hidden --- 		103 else
104 warnx("command `%s' takes from %u to %u arguments",
105 cmdp->cmd, cmdp->minargc-1, cmdp->maxargc-1);
106
107 warnx("usage: %s: %s", cmdp->cmd, cmdp->helptxt);
108 return 1;
109}
110

--- 118 unchanged lines hidden ---