[pkgsrc/trunk]: pkgsrc/misc/less/patches Forgot patches related to less-394:

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d99cd83050db
branches:  trunk
changeset: 528244:d99cd83050db
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Apr 25 18:10:17 2007 +0000

description:
Forgot patches related to less-394:
o patch-ab was merged+removed.
o patch-ac was added, bring in coverity fix from netbsd-current.

diffstat:

 misc/less/patches/patch-ab |  46 ----------------------------------------------
 misc/less/patches/patch-ac |  14 ++++++++++++++
 2 files changed, 14 insertions(+), 46 deletions(-)

diffs (68 lines):

diff -r f6c2fd0002be -r d99cd83050db misc/less/patches/patch-ab
--- a/misc/less/patches/patch-ab        Wed Apr 25 18:06:51 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/09/27 11:28:32 taca Exp $
-
---- tags.c.orig        2004-02-04 13:52:27.000000000 +0900
-+++ tags.c
-@@ -498,7 +498,7 @@ findgtag(tag, type)
- #if !HAVE_POPEN
-               return TAG_NOFILE;
- #else
--              char command[512];
-+              char *command;
-               char *flag;
-               char *qtag;
-               char *cmd = lgetenv("LESSGLOBALTAGS");
-@@ -528,10 +528,13 @@ findgtag(tag, type)
-               qtag = shell_quote(tag);
-               if (qtag == NULL)
-                       qtag = tag;
-+              command = (char *)ecalloc(strlen(cmd) + strlen(flag) +
-+                  strlen(qtag) + 5, sizeof(char));
-               sprintf(command, "%s -x%s %s", cmd, flag, qtag);
-               if (qtag != tag)
-                       free(qtag);
-               fp = popen(command, "r");
-+              free(command);
- #endif
-       }
-       if (fp != NULL)
-@@ -539,6 +542,7 @@ findgtag(tag, type)
-               while (fgets(buf, sizeof(buf), fp))
-               {
-                       char *name, *file, *line;
-+                      size_t len;
- 
-                       if (sigs)
-                       {
-@@ -548,8 +552,8 @@ findgtag(tag, type)
- #endif
-                               return TAG_INTR;
-                       }
--                      if (buf[strlen(buf) - 1] == '\n')
--                              buf[strlen(buf) - 1] = 0;
-+                      if ((len = strlen(buf)) && buf[len - 1] == '\n')
-+                              buf[len - 1] = 0;
-                       else
-                       {
-                               int c;
diff -r f6c2fd0002be -r d99cd83050db misc/less/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/less/patches/patch-ac        Wed Apr 25 18:10:17 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2007/04/25 18:10:17 tnn Exp $
+
+--- edit.c.orig        2005-12-03 21:20:32.000000000 +0100
++++ edit.c
+@@ -711,7 +711,8 @@ use_logfile(filename)
+        */
+       filename = shell_unquote(filename);
+       exists = open(filename, OPEN_READ);
+-      close(exists);
++      if (exists >= 0)
++              close(exists);
+       exists = (exists >= 0);
+ 
+       /*