Date: Sat, 30 Jun 2018 20:10:28 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r335826 - projects/pnfs-planb-server/usr.bin/pnfsdsfile Message-ID: <201806302010.w5UKASsu048773@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sat Jun 30 20:10:28 2018 New Revision: 335826 URL: https://svnweb.freebsd.org/changeset/base/335826 Log: The previous patch checked for other incompatible options too agressively. "-s" can be used with "-z" and this patch again allows that. Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Sat Jun 30 20:09:43 2018 (r335825) +++ projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Sat Jun 30 20:10:28 2018 (r335826) @@ -130,18 +130,18 @@ main(int argc, char *argv[]) break; case 's': /* Translate the server name to an IP address. */ - if (zerofh != 0 || zerods != 0 || mirrorit != 0 || - newres != NULL || res != NULL) - errx(1, "-c, -m, -r, -s and -z are mutually " - "exclusive and only can be used once"); + if (zerods != 0 || mirrorit != 0 || newres != NULL || + res != NULL) + errx(1, "-c, -m and -r are mutually exclusive " + "from use with -s and -z"); if (getaddrinfo(optarg, NULL, NULL, &res) != 0) errx(1, "Can't get IP# for %s", optarg); break; case 'z': if (zerofh != 0 || zerods != 0 || mirrorit != 0 || - newres != NULL || res != NULL) - errx(1, "-c, -m, -r, -s and -z are mutually " - "exclusive and only can be used once"); + newres != NULL) + errx(1, "-c, -m and -r are mutually exclusive " + "from use with -s and -z"); zerofh = 1; break; default:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806302010.w5UKASsu048773>