pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/misc/pinfo



Module Name:    pkgsrc
Committed By:   ktnb
Date:           Fri Nov 20 20:24:55 UTC 2026

Modified Files:
        pkgsrc/misc/pinfo: distinfo
        pkgsrc/misc/pinfo/patches: patch-src_mainfunction.c patch-src_utils.c

Log Message:
pinfo: fixed bug with readline


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/pinfo/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c \
    pkgsrc/misc/pinfo/patches/patch-src_utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/pinfo/distinfo
diff -u pkgsrc/misc/pinfo/distinfo:1.11 pkgsrc/misc/pinfo/distinfo:1.12
--- pkgsrc/misc/pinfo/distinfo:1.11     Fri Nov 20 15:57:10 2026
+++ pkgsrc/misc/pinfo/distinfo  Fri Nov 20 20:24:55 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2026/11/20 15:57:10 ktnb Exp $
+$NetBSD: distinfo,v 1.12 2026/11/20 20:24:55 ktnb Exp $
 
 BLAKE2s (pinfo-0.6.13.tar.gz) = fb352de5e504deb4bb3baca1252c60941e292805c8f8ec37b171918c57a5a3b0
 SHA512 (pinfo-0.6.13.tar.gz) = 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
@@ -7,8 +7,8 @@ SHA1 (patch-ab) = eae999f697e5802309a105
 SHA1 (patch-ac) = 7dbddcf81e9ad6ff00dadd8a93cf2c160992ce75
 SHA1 (patch-src_filehandling__functions.c) = 510ea7560884effb5484d5674aa68bb548ca76be
 SHA1 (patch-src_initializelinks.c) = 6f5abacd6913cdfc4f482bb0d37b218498574565
-SHA1 (patch-src_mainfunction.c) = f032a3b2e63dc57de73d5b129aeefd09ae5b97b5
+SHA1 (patch-src_mainfunction.c) = bd8dbff7fb4f9f6a3f918a365b53a4d963694a05
 SHA1 (patch-src_manual.c) = 27b57e13a39256e3efd5c4edef02c68785dea0b8
 SHA1 (patch-src_parse__config.c) = 5803791d0690da22b4685f13ee8813c92cb24949
-SHA1 (patch-src_utils.c) = 07c9810dff44e3590aaf5059e086887d36d6ca9f
+SHA1 (patch-src_utils.c) = 8e0bf87ffebeae85bd03f2e34c6ac49e54c6ccd9
 SHA1 (patch-src_video.c) = 82904d5258d9fae1d94f297b6e247f2d255eb384

Index: pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c
diff -u pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c:1.1 pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c:1.2
--- pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c:1.1      Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_mainfunction.c  Fri Nov 20 20:24:55 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_mainfunction.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+$NetBSD: patch-src_mainfunction.c,v 1.2 2026/11/20 20:24:55 ktnb Exp $
 
-ctype fix for NetBSD 11
+ctype fix for NetBSD 11, fix bug when there is no readline
 
---- src/mainfunction.c.orig    2026-11-20 14:20:46.610621143 +0000
+--- src/mainfunction.c.orig    2019-02-16 20:23:32.000000000 +0000
 +++ src/mainfunction.c
 @@ -233,7 +233,7 @@ work(char ***message, char **type, unsigned long *line
                                        int digit_val = 1;
@@ -13,3 +13,15 @@ ctype fix for NetBSD 11
                                                        digit_val = 0;
                                        }
                                        if (digit_val)  /* go to specified line */
+@@ -673,7 +673,11 @@ skip_search:
+                               curs_set(1);
+ 
+                               const char ** tag_completions = completions_from_tag_table(tag_table, TagTableEntries);
++#ifdef HAS_READLINE
+                               token = getstring_with_completion(_("Enter node name: "), tag_completions);     /* read user's wish */
++#else
++                              token = getstring_with_completion(_("Enter node name: "));      /* read user's wish */
++#endif
+                               if (tag_completions!=NULL)
+                               {
+                                       free(tag_completions);
Index: pkgsrc/misc/pinfo/patches/patch-src_utils.c
diff -u pkgsrc/misc/pinfo/patches/patch-src_utils.c:1.1 pkgsrc/misc/pinfo/patches/patch-src_utils.c:1.2
--- pkgsrc/misc/pinfo/patches/patch-src_utils.c:1.1     Fri Nov 20 15:57:11 2026
+++ pkgsrc/misc/pinfo/patches/patch-src_utils.c Fri Nov 20 20:24:55 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_utils.c,v 1.1 2026/11/20 15:57:11 ktnb Exp $
+$NetBSD: patch-src_utils.c,v 1.2 2026/11/20 20:24:55 ktnb Exp $
 
-ctype fix for NetBSD 11 and sys/wait.h is required
+ctype fix for NetBSD 11, sys/wait.h is required, and fix readline conditional
 
---- src/utils.c.orig   2026-11-20 14:25:26.785618991 +0000
+--- src/utils.c.orig   2019-02-16 20:23:32.000000000 +0000
 +++ src/utils.c
 @@ -24,6 +24,7 @@
  #include <regex.h>
@@ -21,7 +21,51 @@ ctype fix for NetBSD 11 and sys/wait.h i
                {
                        completions[j++] = table[i].nodename;
                }
-@@ -604,14 +605,14 @@ yesno(char *prompt, int def)
+@@ -365,15 +366,18 @@ getstring(char *prompt)
+ char *
+ getstring(char *prompt)
+ {
++#ifdef HAS_READLINE
+       return getstring_with_completion(prompt, NULL);
++#else
++      return getstring_with_completion(prompt);
++#endif
+ }
+-
++#ifdef HAS_READLINE
+ char *
+ getstring_with_completion(char *prompt, const char * const * completions)
+ {
+       char *buf;
+ 
+-#ifdef HAS_READLINE
+       completion_values = completions;
+       rl_attempted_completion_function = getstring_completion;
+       rl_completion_display_matches_hook = my_rl_completion_display;
+@@ -393,15 +397,20 @@ getstring_with_completion(char *prompt, const char * c
+ 
+       curs_set(0);
+ 
++      return buf;
++}
+ #else
++char *
++getstring_with_completion(char *prompt)
++{
++      char *buf;
+ 
+       move(maxy - 1, 0);
+       buf = readlinewrapper(prompt);
+ 
+-#endif
+-
+       return buf;
+ }
++#endif
+ 
+ void
+ init_curses()
+@@ -604,14 +613,14 @@ yesno(char *prompt, int def)
                        break;
                else
                {



Home | Main Index | Thread Index | Old Index