bin/81709: lam accepts -P but not -p

[Diane Bruce]

>Number:         81709
>Category:       bin
>Synopsis:       lam accepts -P but not -p
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 31 12:00:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Diane Bruce
>Release:        FreeBSD 5.4-RELEASE-p1 i386
>Organization:
Very unorganized.
>Environment:
System: FreeBSD night.db.net 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #7: Thu May 19 07:07:49 EDT 2005 root@:/usr/src/sys/i386/compile/NIGHT i386


>Description:
	lam honours the -P flag but not the -p flag, which should
	do exactly the same thing.

>How-To-Repeat:
echo A > f1
echo B > f2
echo C >> f2
lam -P 1.1 f1 f2
AB
 C
lam -p 1.1 f1 f2
AB
C

>Fix:

This patch will fix it, but it really should be rewritten.

PATCH tested


--- lam.c.orig	Tue May 31 07:03:26 2005
+++ lam.c	Tue May 31 06:57:40 2005
@@ -120,7 +120,8 @@
 			else if ((ip->fp = fopen(p, "r")) == NULL) {
 				err(1, "%s", p);
 			}
-			ip->pad = P;
+			if(!ip->pad)
+				ip->pad = P;
 			if (!ip->sepstring)
 				ip->sepstring = (S ? (ip-1)->sepstring : "");
 			if (!ip->format)

>Release-Note:
>Audit-Trail:
>Unformatted: