Ticket #25733: nvilangmsg.patch

(a) Portfile-old vs. (b) Portfile

@@ -4 +4 @@
 
 name            nvi
 version         1.81.6
-revision        2
+revision        3
 categories      editors
 maintainers     toby
 description     A vi/ex clone
@@ -30 +30 @@
     patch-common__key.h \
     patch-dist__port.h.in \
     patch-ex_script.c.diff \
-    patch-powerof2.diff
+    patch-powerof2.diff \
+    patch-msg.c.diff
 
 configure.args \
     --program-prefix=n \

files/

@@ +1 @@
+# Stop the error message:
+$ nvi
+./en_US.UTF-8: No such file or directory
+$
+
+--- ../common/msg.c-dist        2007-11-18 10:41:42.000000000 -0600
++++ ../common/msg.c     2010-08-29 19:14:20.000000000 -0500
+@@ -715,7 +715,7 @@
+        DB *db;
+        DBT data, key;
+        db_recno_t msgno;
+-       char *p, *t, buf[MAXPATHLEN];
++       char *p, *p2, *t, buf[MAXPATHLEN];
+ 
+        if ((p = strrchr(file, '/')) != NULL && p[1] == '\0' &&
+            (((t = getenv("LC_MESSAGES")) != NULL && t[0] != '\0') ||
+@@ -724,16 +724,15 @@
+                p = buf;
+        } else
+                p = file;
+-       if ((sp->db_error = db_create(&db, 0, 0)) != 0 ||
+-           (sp->db_error = db->set_re_source(db, p)) != 0 ||
+-           (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) {
+-               if (first) {
+-                       first = 0;
+-                       return (1);
+-               }
+-               msgq_str(sp, M_DBERR, p, "%s");
+-               return (1);
+-       }
++
++       p2 = "%s";
++       if ((sp->db_error = db_create(&db, 0, 0)) == 0 &&
++           (sp->db_error = db->set_re_source(db, p)) == 0) {
++               db->set_errcall(db, 0);
++               if ((sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0)
++                       goto err;
++       } else
++               goto err;
+ 
+        /*
+         * Test record 1 for the magic string.  The msgq call is here so
+@@ -749,13 +748,8 @@
+            data.size != sizeof(VMC) - 1 ||
+            memcmp(data.data, VMC, sizeof(VMC) - 1)) {
+                (void)db->close(db, DB_NOSYNC);
+-               if (first) {
+-                       first = 0;
+-                       return (1);
+-               }
+-               msgq_str(sp, M_DBERR, p,
+-                   "030|The file %s is not a message catalog");
+-               return (1);
++               p2 = "030|The file %s is not a message catalog";
++               goto err;
+        }
+        first = 0;
+ 
+@@ -763,6 +757,14 @@
+                (void)sp->gp->msg->close(sp->gp->msg, DB_NOSYNC);
+        sp->gp->msg = db;
+        return (0);
++
++err:
++       if (first) {
++               first = 0;
++               return (1);
++       }
++       msgq_str(sp, M_DBERR, p, p2);
++       return (1);
+ }
+ 
+ /*