Tue Aug 28 13:23:34 2018 UTC ()
Pull up following revision(s) (requested by sevan in ticket #993):

	sbin/fdisk/fdisk.c: revision 1.155

Add missing -z flag to usage()


(martin)
diff -r1.153 -r1.153.8.1 src/sbin/fdisk/fdisk.c
cvs diff -r1.153 -r1.153.8.1 src/sbin/fdisk/fdisk.c (expand / switch to unified diff)

--- src/sbin/fdisk/fdisk.c 2015/11/22 15:53:10 1.153
+++ src/sbin/fdisk/fdisk.c 2018/08/28 13:23:34 1.153.8.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: fdisk.c,v 1.153 2015/11/22 15:53:10 christos Exp $ */ 1/* $NetBSD: fdisk.c,v 1.153.8.1 2018/08/28 13:23:34 martin Exp $ */
2 2
3/* 3/*
4 * Mach Operating System 4 * Mach Operating System
5 * Copyright (c) 1992 Carnegie Mellon University 5 * Copyright (c) 1992 Carnegie Mellon University
6 * All Rights Reserved. 6 * All Rights Reserved.
7 * 7 *
8 * Permission to use, copy, modify and distribute this software and its 8 * Permission to use, copy, modify and distribute this software and its
9 * documentation is hereby granted, provided that both the copyright 9 * documentation is hereby granted, provided that both the copyright
10 * notice and this permission notice appear in all copies of the 10 * notice and this permission notice appear in all copies of the
11 * software, derivative works or modified versions, and any portions 11 * software, derivative works or modified versions, and any portions
12 * thereof, and that both notices appear in supporting documentation. 12 * thereof, and that both notices appear in supporting documentation.
13 * 13 *
14 * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 14 * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
@@ -29,27 +29,27 @@ @@ -29,27 +29,27 @@
29/* 29/*
30 * 14-Dec-89 Robert Baron (rvb) at Carnegie-Mellon University 30 * 14-Dec-89 Robert Baron (rvb) at Carnegie-Mellon University
31 * Copyright (c) 1989 Robert. V. Baron 31 * Copyright (c) 1989 Robert. V. Baron
32 * Created. 32 * Created.
33 */ 33 */
34 34
35#if HAVE_NBTOOL_CONFIG_H 35#if HAVE_NBTOOL_CONFIG_H
36#include "nbtool_config.h" 36#include "nbtool_config.h"
37#endif 37#endif
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40 40
41#ifndef lint 41#ifndef lint
42__RCSID("$NetBSD: fdisk.c,v 1.153 2015/11/22 15:53:10 christos Exp $"); 42__RCSID("$NetBSD: fdisk.c,v 1.153.8.1 2018/08/28 13:23:34 martin Exp $");
43#endif /* not lint */ 43#endif /* not lint */
44 44
45#define MBRPTYPENAMES 45#define MBRPTYPENAMES
46#include <sys/types.h> 46#include <sys/types.h>
47#include <sys/param.h> 47#include <sys/param.h>
48#include <sys/stat.h> 48#include <sys/stat.h>
49#include <ctype.h> 49#include <ctype.h>
50#include <err.h> 50#include <err.h>
51#include <errno.h> 51#include <errno.h>
52#include <fcntl.h> 52#include <fcntl.h>
53#include <paths.h> 53#include <paths.h>
54#include <stdarg.h> 54#include <stdarg.h>
55#include <stddef.h> 55#include <stddef.h>
@@ -667,27 +667,27 @@ out: errx(EXIT_FAILURE, "Invalid sec @@ -667,27 +667,27 @@ out: errx(EXIT_FAILURE, "Invalid sec
667 667
668static void 668static void
669usage(void) 669usage(void)
670{ 670{
671 int indent = 7 + (int)strlen(getprogname()) + 1; 671 int indent = 7 + (int)strlen(getprogname()) + 1;
672 672
673 (void)fprintf(stderr, "usage: %s [-aBFfIilSuv] " 673 (void)fprintf(stderr, "usage: %s [-aBFfIilSuv] "
674 "[-A ptn_alignment[/ptn_0_offset]] \\\n" 674 "[-A ptn_alignment[/ptn_0_offset]] \\\n"
675 "%*s[-b cylinders/heads/sectors] \\\n" 675 "%*s[-b cylinders/heads/sectors] \\\n"
676 "%*s[-0123 | -E num " 676 "%*s[-0123 | -E num "
677 "[-s [id][/[start][/[size][/bootmenu]]]] \\\n" 677 "[-s [id][/[start][/[size][/bootmenu]]]] \\\n"
678 "%*s[-t disktab] [-T disktype] \\\n" 678 "%*s[-t disktab] [-T disktype] \\\n"
679 "%*s[-c bootcode] " 679 "%*s[-c bootcode] "
680 "[-r|-w file] [device]\n" 680 "[-r|-w file] [-z sectorsize] [device]\n"
681 "\t-a change active partition\n" 681 "\t-a change active partition\n"
682 "\t-f force - not interactive\n" 682 "\t-f force - not interactive\n"
683 "\t-i initialise MBR code\n" 683 "\t-i initialise MBR code\n"
684 "\t-I ignore errors about no space or overlapping partitions\n" 684 "\t-I ignore errors about no space or overlapping partitions\n"
685 "\t-l list partition types\n" 685 "\t-l list partition types\n"
686 "\t-u update partition data\n" 686 "\t-u update partition data\n"
687 "\t-v verbose output, -v -v more verbose still\n" 687 "\t-v verbose output, -v -v more verbose still\n"
688 "\t-B update bootselect options\n" 688 "\t-B update bootselect options\n"
689 "\t-F treat device as a regular file\n" 689 "\t-F treat device as a regular file\n"
690 "\t-S output as shell defines\n" 690 "\t-S output as shell defines\n"
691 "\t-r and -w access 'file' for non-destructive testing\n", 691 "\t-r and -w access 'file' for non-destructive testing\n",
692 getprogname(), indent, "", indent, "", indent, "", indent, ""); 692 getprogname(), indent, "", indent, "", indent, "", indent, "");
693 exit(1); 693 exit(1);