pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/focal Rename patch files to new standard for tidi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfc1a2f84580
branches:  trunk
changeset: 604496:dfc1a2f84580
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu May 31 23:42:01 2012 +0000

description:
Rename patch files to new standard for tidiness. No functional change.

diffstat:

 lang/focal/distinfo               |    8 +-
 lang/focal/patches/patch-aa       |  111 --------------------------------------
 lang/focal/patches/patch-ab       |   35 -----------
 lang/focal/patches/patch-ac       |   15 -----
 lang/focal/patches/patch-focal0_c |  111 ++++++++++++++++++++++++++++++++++++++
 lang/focal/patches/patch-focal2_c |   35 +++++++++++
 lang/focal/patches/patch-proto_h  |   15 +++++
 7 files changed, 165 insertions(+), 165 deletions(-)

diffs (truncated from 364 to 300 lines):

diff -r bb4278d3d9fd -r dfc1a2f84580 lang/focal/distinfo
--- a/lang/focal/distinfo       Thu May 31 23:40:06 2012 +0000
+++ b/lang/focal/distinfo       Thu May 31 23:42:01 2012 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2012/05/31 23:37:57 dholland Exp $
+$NetBSD: distinfo,v 1.6 2012/05/31 23:42:01 dholland Exp $
 
 SHA1 (focal.tar.gz) = 704d1411365085fb47ff25c1a77ae1f8e7fa601e
 RMD160 (focal.tar.gz) = 6b06cc08b2761035c315ae13b80d64a5e7a6004b
 Size (focal.tar.gz) = 12561 bytes
-SHA1 (patch-aa) = 9e761e135665dad02b8cc700d80bf4eba69a0e7d
-SHA1 (patch-ab) = b4f0c53188dc67fa890da6093d5d5431df3b7efc
-SHA1 (patch-ac) = b56fe36efbcb15f6a5454943a40871683d0c1e0a
+SHA1 (patch-focal0_c) = 9e761e135665dad02b8cc700d80bf4eba69a0e7d
 SHA1 (patch-focal1_c) = 3957cde40ea86a218aea8411623d4bd033df9dbe
+SHA1 (patch-focal2_c) = b4f0c53188dc67fa890da6093d5d5431df3b7efc
 SHA1 (patch-focal3_c) = 1624c53612707f71f628a74bf6bc186bfff0f96b
+SHA1 (patch-proto_h) = b56fe36efbcb15f6a5454943a40871683d0c1e0a
diff -r bb4278d3d9fd -r dfc1a2f84580 lang/focal/patches/patch-aa
--- a/lang/focal/patches/patch-aa       Thu May 31 23:40:06 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2012/05/31 23:37:57 dholland Exp $
-
-- place a big comment within a comment (just within a false ifdef is
-not sufficient)
-- do not use gets()
-- use ctype.h functions correctly
-- avoid symbol conflict with getline()
-- don't use implicit int
-
---- focal0.c.orig      1995-04-17 13:03:43.000000000 +0000
-+++ focal0.c
-@@ -13,6 +13,7 @@
-       $(ATOD)         = 1
-       $(DTOA)         = 1
- */
-+/*
- #ifdef        DOCUMENTATION
- 
- title focal           Ancient Interpretive Language
-@@ -35,6 +36,7 @@ author
-       Dave Conroy
- 
- #endif
-+*/
- 
- #include      "focal.h"
- #ifdef        vms
-@@ -66,6 +68,24 @@ int intflag;                        /* Interrupt flag */
- 
- struct        sym     *sym[N_HASH + 1];       /* Symbol table */
- 
-+static char *
-+dogets(char *buf, size_t len)
-+{
-+      char *ret;
-+
-+      ret = fgets(buf, len, stdin);
-+      if (ret != NULL) {
-+              len = strlen(buf);
-+              if (len > 0 && buf[len-1] == '\n') {
-+                      buf[--len] = '\0';
-+              }
-+              if (len > 0 && buf[len-1] == '\r') {
-+                      buf[--len] = '\0';
-+              }
-+      }
-+      return ret;
-+}
-+
- int main()
- {
-       register int    c;
-@@ -86,7 +106,7 @@ int main()
-       catchcc();
-       for (;;) {
-               putchar('*');
--              if (gets(cbuf) == NULL) {
-+              if (dogets(cbuf, sizeof(cbuf)) == NULL) {
-                       putchar('\n');
-                       break;
-               }
-@@ -205,7 +225,7 @@ loop:
-                       popdo();
-               goto loop;
-       }
--      while (isalpha(*ctp))
-+      while (isalpha((unsigned char)*ctp))
-               ++ctp;
-       if (isupper(c))
-               c = tolower(c);
-@@ -427,7 +447,7 @@ void ask()
-               --ctp;
-               sp = getsym();
-               printf(": ");
--              if (gets(abuf) == NULL) {
-+              if (dogets(abuf, sizeof(abuf)) == NULL) {
-                       putchar('\n');
-                       diag("EOF in ask");
-               }
-@@ -649,11 +669,11 @@ register int     c;
- }
- 
- 
--int getline(cp, fp)
-+int get_line(cp, fp)
- register char *cp;
- register FILE *fp;
- {
--      register c;
-+      register int c;
- 
-       while ((c=getc(fp))!=EOF && c!='\n')
-               *cp++ = c;
-@@ -667,7 +687,7 @@ register FILE *fp;
- void type()
- {
-       register char *fmt;
--      register c;
-+      register int c;
- static        char fmtb[20];
- static        int ifmtb = 1;
-       int x, y;
-@@ -724,7 +744,7 @@ FILE *fp;
- {
-       struct lno lno;
-       register struct line *lp;
--      register tgroup, lgroup;
-+      register int tgroup, lgroup;
- 
-       if (lnop == NULL) {
-               lno.ln_type = LN_ALL;
diff -r bb4278d3d9fd -r dfc1a2f84580 lang/focal/patches/patch-ab
--- a/lang/focal/patches/patch-ab       Thu May 31 23:40:06 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2012/05/31 23:37:57 dholland Exp $
-
-- use ctype.h functions correctly
-- avoid symbol name conflict with getline()
-- the name in struct dirent is null-terminated, don't try to bound it
-
---- focal2.c.orig      1995-04-17 13:03:46.000000000 +0000
-+++ focal2.c
-@@ -49,7 +49,7 @@ void library()
-       c = getnb();
-       if (c!='c' && c!='s' && c!='l' && c!='d')
-               diag("Bad library command");
--      while (isalpha(*ctp))
-+      while (isalpha((unsigned char)*ctp))
-               ++ctp;
-       while ((d = *ctp)==' ' || d=='\t')
-               ++ctp;
-@@ -71,7 +71,7 @@ void library()
-               }
-               line = NULL;
-               sctp = ctp;
--              while (getline(abuf, fp) != 0) {
-+              while (get_line(abuf, fp) != 0) {
-                       ctp = abuf;
-                       if ((c=getnb()) != 0) {
-                               if (isdigit(c) == 0)
-@@ -138,7 +138,7 @@ void library()
-                           ||  strcmp(de->d_name, ".") == 0
-                           ||  strcmp(de->d_name, "..") == 0)
-                               continue;
--                      printf("%.*s\n", de->d_reclen, de->d_name);
-+                      printf("%s\n", de->d_name);
-               }
-               closedir(dp);
- #else
diff -r bb4278d3d9fd -r dfc1a2f84580 lang/focal/patches/patch-ac
--- a/lang/focal/patches/patch-ac       Thu May 31 23:40:06 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2012/05/31 23:37:57 dholland Exp $
-
-- avoid symbol name conflict with getline()
-
---- proto.h~   1995-04-17 13:03:41.000000000 +0000
-+++ proto.h
-@@ -17,7 +17,7 @@ void popdo ARG((void));
- void  popfor ARG((void));
- void  clearfors ARG((struct sym *sp));
- void  inject ARG((int c));
--int   getline ARG((char *cp, FILE *fp));
-+int   get_line ARG((char *cp, FILE *fp));
- void  type ARG((void));
- void  save ARG((struct lno *lnop, FILE *fp));
- void  erasesyms ARG((void));
diff -r bb4278d3d9fd -r dfc1a2f84580 lang/focal/patches/patch-focal0_c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/focal/patches/patch-focal0_c Thu May 31 23:42:01 2012 +0000
@@ -0,0 +1,111 @@
+$NetBSD: patch-focal0_c,v 1.1 2012/05/31 23:42:01 dholland Exp $
+
+- place a big comment within a comment (just within a false ifdef is
+not sufficient)
+- do not use gets()
+- use ctype.h functions correctly
+- avoid symbol conflict with getline()
+- don't use implicit int
+
+--- focal0.c.orig      1995-04-17 13:03:43.000000000 +0000
++++ focal0.c
+@@ -13,6 +13,7 @@
+       $(ATOD)         = 1
+       $(DTOA)         = 1
+ */
++/*
+ #ifdef        DOCUMENTATION
+ 
+ title focal           Ancient Interpretive Language
+@@ -35,6 +36,7 @@ author
+       Dave Conroy
+ 
+ #endif
++*/
+ 
+ #include      "focal.h"
+ #ifdef        vms
+@@ -66,6 +68,24 @@ int intflag;                        /* Interrupt flag */
+ 
+ struct        sym     *sym[N_HASH + 1];       /* Symbol table */
+ 
++static char *
++dogets(char *buf, size_t len)
++{
++      char *ret;
++
++      ret = fgets(buf, len, stdin);
++      if (ret != NULL) {
++              len = strlen(buf);
++              if (len > 0 && buf[len-1] == '\n') {
++                      buf[--len] = '\0';
++              }
++              if (len > 0 && buf[len-1] == '\r') {
++                      buf[--len] = '\0';
++              }
++      }
++      return ret;
++}
++
+ int main()
+ {
+       register int    c;
+@@ -86,7 +106,7 @@ int main()
+       catchcc();
+       for (;;) {
+               putchar('*');
+-              if (gets(cbuf) == NULL) {
++              if (dogets(cbuf, sizeof(cbuf)) == NULL) {
+                       putchar('\n');
+                       break;
+               }
+@@ -205,7 +225,7 @@ loop:
+                       popdo();
+               goto loop;
+       }
+-      while (isalpha(*ctp))
++      while (isalpha((unsigned char)*ctp))
+               ++ctp;
+       if (isupper(c))
+               c = tolower(c);
+@@ -427,7 +447,7 @@ void ask()
+               --ctp;
+               sp = getsym();
+               printf(": ");
+-              if (gets(abuf) == NULL) {
++              if (dogets(abuf, sizeof(abuf)) == NULL) {
+                       putchar('\n');
+                       diag("EOF in ask");
+               }
+@@ -649,11 +669,11 @@ register int     c;
+ }
+ 
+ 
+-int getline(cp, fp)
++int get_line(cp, fp)
+ register char *cp;
+ register FILE *fp;
+ {
+-      register c;
++      register int c;
+ 
+       while ((c=getc(fp))!=EOF && c!='\n')
+               *cp++ = c;
+@@ -667,7 +687,7 @@ register FILE *fp;
+ void type()
+ {
+       register char *fmt;
+-      register c;
++      register int c;
+ static        char fmtb[20];
+ static        int ifmtb = 1;
+       int x, y;
+@@ -724,7 +744,7 @@ FILE *fp;
+ {
+       struct lno lno;



Home | Main Index | Thread Index | Old Index