From: schwarze <schwarze@openbsd.org>
Date: Wed, 11 Jul 2018 11:35:06 +0000 (+0000)
Subject: Repair the regression introduced by the recent refactoring
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=175b0c4bb1988fc0ecac5c9f206ebb12f4cabbae;p=openbsd

Repair the regression introduced by the recent refactoring
revision 1.11 date: 2004/07/03 21:00:37;
for -p/-P, the argument was no longer parsed, causing segfaults.
OK millert@
---

diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index a2a70e9747c..c7bac5bd7cd 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lam.c,v 1.19 2015/10/09 01:37:08 deraadt Exp $	*/
+/*	$OpenBSD: lam.c,v 1.20 2018/07/11 11:35:06 schwarze Exp $	*/
 /*	$NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $	*/
 
 /*-
@@ -109,6 +109,10 @@ getargs(int argc, char *argv[])
 	P = S = F = T = 0;		/* capitalized options */
 	while (optind < argc) {
 		switch (ch = getopt(argc, argv, "F:f:P:p:S:s:T:t:")) {
+		case 'P': case 'p':
+			P = (ch == 'P');
+			ip->pad = 1;
+			/* FALLTHROUGH */
 		case 'F': case 'f':
 			F = (ch == 'F');
 			/* Validate format string argument. */
@@ -124,10 +128,6 @@ getargs(int argc, char *argv[])
 			snprintf(p, siz, "%%%ss", optarg);
 			ip->format = p;
 			break;
-		case 'P': case 'p':
-			P = (ch == 'P');
-			ip->pad = 1;
-			break;
 		case 'S': case 's':
 			S = (ch == 'S');
 			ip->sepstring = optarg;