From owner-freebsd-ports Wed May 17 0:50:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 6A43E37BA91 for ; Wed, 17 May 2000 00:50:06 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id AAA03471; Wed, 17 May 2000 00:50:06 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from fysgr665.sn.umu.se (fysgr665.sn.umu.se [130.239.129.42]) by hub.freebsd.org (Postfix) with ESMTP id 2429237B9C0 for ; Wed, 17 May 2000 00:44:47 -0700 (PDT) (envelope-from saska@fysgr665.sn.umu.se) Received: by fysgr665.sn.umu.se (Postfix, from userid 1000) id A1192BF; Wed, 17 May 2000 09:49:23 +0200 (CEST) Message-Id: <20000517074923.A1192BF@fysgr665.sn.umu.se> Date: Wed, 17 May 2000 09:49:23 +0200 (CEST) From: markush@acc.umu.se To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/18616: colorls outputs colorization and type char in different order in long and short mode Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 18616 >Category: ports >Synopsis: colorls outputs colorization and type char in different order in long and short mode >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 17 00:50:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Markus Holmberg >Release: FreeBSD 3.4-STABLE i386 >Organization: n/a >Environment: FreeBSD with the colorls-2.2.7 port installed. >Description: When colorls colorizes the long output format, it puts the closing colorization code after the "type character", as opposed to before in short output format. This is a very minor annoyance, but a fix won't hurt (improves readability in long output format IMHO and makes behaviour consistent). >How-To-Repeat: Compare the colorization output of: colorls -FG colorls -FG -l >Fix: Apply the patch below (same patch in plain text and uuencoded). The patch patches the (only) patch in the port to correct the issue. --- patch-aa.orig Tue May 16 18:29:28 2000 +++ patch-aa Tue May 16 18:29:31 2000 @@ -91,7 +91,7 @@ void printscol(dp) DISPLAY *dp; -@@ -124,10 +144,14 @@ +@@ -124,8 +144,12 @@ printtime(sp->st_ctime); else printtime(sp->st_mtime); @@ -99,13 +99,11 @@ + (void)colortype(sp->st_mode); if (f_octal || f_octal_escape) (void)prn_octal(p->fts_name); else (void)printf("%s", p->fts_name); - if (f_type) - (void)printtype(sp->st_mode); + if (f_color) + (void)printf("\033[m"); + if (f_type) + (void)printtype(sp->st_mode); if (S_ISLNK(sp->st_mode)) - printlink(p); - (void)putchar('\n'); @@ -191,10 +215,22 @@ dp->s_block); if ((base += numrows) >= num) begin 644 colorls.patch M+2TM('!A=&-H+6%A+F]R:6<)5'5E($UA>2`Q-B`Q.#HR.3HR."`R,#`P"BLK M*R!P871C:"UA80E4=64@36%Y(#$V(#$X.C(Y.C,Q(#(P,#`*0$`@+3DQ+#<@ M*SDQ+#<@0$`*("!V;VED"B`@<')I;G1S8V]L*&1P*0H@(`E$25-03$%9("ID M<#L*+4!`("TQ,C0L,3`@*S$T-"PQ-"!`0`HK0$`@+3$R-"PX("LQ-#0L,3(@ M0$`*("`)"0EP7!E M*'-P+3YS=%]M;V1E*3L*("L)"6EF("AF7V-O;&]R*0H@*PD)"2AV;VED*7!R M:6YT9B@B7#`S,UMM(BD["BL@"0EI9B`H9E]T>7!E*0HK(`D)"2AV;VED*7!R M:6YT='EP92AS<"T^Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message