d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a -q[uiet] flag for scripts.

Browse Source
This commit is contained in:
David E. O'Brien 2008-07-31 00:55:29 +00:00
parent f4779b9d6e
commit a61d918656
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbin/fdisk/fdisk.8
View File

@ -8,7 +8,7 @@
.Nd PC slice table maintenance utility
.Sh SYNOPSIS
.Nm
.Op Fl BIaipstu
.Op Fl BIaipqstu
.Op Fl b Ar bootcode
.Op Fl 1234
.Op Ar disk
@ -115,6 +115,9 @@ Print a slice table in
configuration file format and exit; see
.Sx CONFIGURATION FILE ,
below.
.It Fl q
Be quiet.
Benign warnings (such as "GEOM not found") are suppressed.
.It Fl s
Print summary information and exit.
.It Fl t

11
sbin/fdisk/fdisk.c
View File

@ -115,6 +115,7 @@ static int I_flag = 0; /* use entire disk for FreeBSD */
static int a_flag = 0; /* set active partition */
static char *b_flag = NULL; /* path to boot code */
static int i_flag = 0; /* replace partition data */
static int q_flag = 0; /* Be quiet */
static int u_flag = 0; /* update partition data */
static int s_flag = 0; /* Print a summary and exit */
static int t_flag = 0; /* test only */
@ -249,7 +250,7 @@ main(int argc, char *argv[])
int partition = -1;
struct dos_partition *partp;
while ((c = getopt(argc, argv, "BIab:f:ipstuv1234")) != -1)
while ((c = getopt(argc, argv, "BIab:f:ipqstuv1234")) != -1)
switch (c) {
case 'B':
B_flag = 1;
@ -272,6 +273,9 @@ main(int argc, char *argv[])
case 'p':
print_config_flag = 1;
break;
case 'q':
q_flag = 1;
break;
case 's':
s_flag = 1;
break;
@ -440,7 +444,7 @@ static void
usage()
{
fprintf(stderr, "%s%s",
"usage: fdisk [-BIaipstu] [-b bootcode] [-1234] [disk]\n",
"usage: fdisk [-BIaipqstu] [-b bootcode] [-1234] [disk]\n",
" fdisk -f configfile [-itv] [disk]\n");
exit(1);
}
@ -793,7 +797,8 @@ write_disk(off_t sector, void *buf)
gctl_free(grq);
return(0);
}
warnx("%s", q);
if (!q_flag) /* GEOM errors are benign, not all devices supported */
warnx("%s", q);
gctl_free(grq);
error = pwrite(fd, buf, secsize, (sector * 512));