mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-30 16:51:41 +00:00
Code Issues Releases Activity

-Wall cleaning. Use getopt(3).

Browse Source
This commit is contained in:
Philippe Charnier 2000-11-28 18:09:08 +00:00
parent 23bfe8ff6b
commit cf6b5cdb0f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=69311
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
usr.sbin/diskpart/diskpart.c
View File

@ -55,6 +55,9 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define for_now /* show all of `c' partition for disklabel */
#define NPARTITIONS 8
@ -114,7 +117,9 @@ int pflag; /* print device driver partition tables */
int dflag; /* print disktab entry */
struct disklabel *promptfordisk();
int gettype __P((char *, char **));
static void usage __P((void));
int ustrcmp __P((char *, char *));
int
main(argc, argv)
@ -125,23 +130,29 @@ main(argc, argv)
register int curcyl, spc, def, part, layout, j;
int threshhold, numcyls[NPARTITIONS], startcyl[NPARTITIONS];
int totsize = 0;
char *lp, *tyname;
char *lp, *tyname = NULL;
int ch;
argc--, argv++;
if (argc < 1)
while ((ch = getopt(argc, argv, "dps:")) != -1)
switch(ch) {
case 'd':
dflag++;
break;
case 'p':
pflag++;
break;
case 's':
totsize = atoi(optarg);
break;
default:
usage();
}
argv += optind;
argc -= optind;
if (argc != 1)
usage();
if (argc > 0 && strcmp(*argv, "-p") == 0) {
pflag++;
argc--, argv++;
}
if (argc > 0 && strcmp(*argv, "-d") == 0) {
dflag++;
argc--, argv++;
}
if (argc > 1 && strcmp(*argv, "-s") == 0) {
totsize = atoi(argv[1]);
argc += 2, argv += 2;
}
dp = getdiskbyname(*argv);
if (dp == NULL) {
if (isatty(0))
@ -337,6 +348,7 @@ main(argc, argv)
startcyl[part], startcyl[part] + numcyls[part] - 1,
defpart[def][part] % spc ? "*" : "");
}
return(0);
}
static void
@ -465,6 +477,7 @@ promptfordisk(name)
return (dp);
}
int
gettype(t, names)
char *t;
char **names;
@ -479,6 +492,7 @@ gettype(t, names)
return (-1);
}
int
ustrcmp(s1, s2)
register char *s1, *s2;
{