Deleted Added
full compact
iscsictl.c (289459) iscsictl.c (298879)
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/usr.bin/iscsictl/iscsictl.c 289459 2015-10-17 16:05:42Z trasz $");
32__FBSDID("$FreeBSD: head/usr.bin/iscsictl/iscsictl.c 298879 2016-05-01 16:13:05Z pfg $");
33
34#include <sys/ioctl.h>
35#include <sys/param.h>
36#include <sys/linker.h>
37#include <assert.h>
38#include <ctype.h>
39#include <errno.h>
40#include <fcntl.h>

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

766 usage();
767
768 if (Aflag + Mflag + Rflag + Lflag == 0)
769 Lflag = 1;
770 if (Aflag + Mflag + Rflag + Lflag > 1)
771 xo_errx(1, "at most one of -A, -M, -R, or -L may be specified");
772
773 /*
33
34#include <sys/ioctl.h>
35#include <sys/param.h>
36#include <sys/linker.h>
37#include <assert.h>
38#include <ctype.h>
39#include <errno.h>
40#include <fcntl.h>

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

766 usage();
767
768 if (Aflag + Mflag + Rflag + Lflag == 0)
769 Lflag = 1;
770 if (Aflag + Mflag + Rflag + Lflag > 1)
771 xo_errx(1, "at most one of -A, -M, -R, or -L may be specified");
772
773 /*
774 * Note that we ignore unneccessary/inapplicable "-c" flag; so that
774 * Note that we ignore unnecessary/inapplicable "-c" flag; so that
775 * people can do something like "alias ISCSICTL="iscsictl -c path"
776 * in shell scripts.
777 */
778 if (Aflag != 0) {
779 if (aflag != 0) {
780 if (portal != NULL)
781 xo_errx(1, "-a and -p and mutually exclusive");
782 if (target != NULL)

--- 198 unchanged lines hidden ---
775 * people can do something like "alias ISCSICTL="iscsictl -c path"
776 * in shell scripts.
777 */
778 if (Aflag != 0) {
779 if (aflag != 0) {
780 if (portal != NULL)
781 xo_errx(1, "-a and -p and mutually exclusive");
782 if (target != NULL)

--- 198 unchanged lines hidden ---