SOURCES: tcsh-misc.patch, tcsh-nls-codesets.patch, tcsh-no_TERMCAP.patch, t...
baggins
baggins at pld-linux.org
Thu Apr 9 11:45:54 CEST 2009
Author: baggins Date: Thu Apr 9 09:45:54 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 6.16.00
---- Files affected:
SOURCES:
tcsh-misc.patch (1.3 -> 1.4) , tcsh-nls-codesets.patch (1.1 -> 1.2) , tcsh-no_TERMCAP.patch (1.1 -> 1.2) , tcsh-rlimit_locks.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/tcsh-misc.patch
diff -u SOURCES/tcsh-misc.patch:1.3 SOURCES/tcsh-misc.patch:1.4
--- SOURCES/tcsh-misc.patch:1.3 Sun Sep 5 13:24:55 2004
+++ SOURCES/tcsh-misc.patch Thu Apr 9 11:45:47 2009
@@ -3,7 +3,7 @@
@@ -3,7 +3,7 @@
spanish ukrainian
#GENCAT= gencat --new
- #CHARSET= charset
+ CHARSET= charset
-GENCAT= gencat
+GENCAT= gencat --new
@@ -24,15 +24,6 @@
## LDFLAGS. Define something here if you need to
--- tcsh-6.08.01.orig/config_f.h
+++ tcsh-6.08.01/config_f.h
-@@ -65,7 +65,7 @@
- * if you don't have <nl_types.h>, you don't want
- * to define this.
- */
--#undef NLS_CATALOGS
-+#define NLS_CATALOGS
-
- /*
- * LOGINFIRST Source ~/.login before ~/.cshrc
@@ -80,7 +80,7 @@
/*
* KAI use "bye" command and rename "log" to "watchlog"
@@ -66,17 +57,6 @@
/*
* SYSMALLOC Use the system provided version of malloc and friends.
---- tcsh-6.08.01.orig/tc.os.h
-+++ tcsh-6.08.01/tc.os.h
-@@ -529,7 +529,7 @@
-
- #if !defined(BSD4_4) && !defined(__linux__) && !defined(__hpux) && !defined(sgi)
- #ifndef NEEDgethostname
--extern int gethostname __P((char *, int));
-+extern int gethostname __P((char *, size_t));
- #endif /* NEEDgethostname */
- #endif /* !BDS4_4 && !__linux__ && !__hpux && !sgi */
-
--- tcsh-6.08.01.orig/tcsh.man
+++ tcsh-6.08.01/tcsh.man
@@ -560,7 +560,7 @@
================================================================
Index: SOURCES/tcsh-nls-codesets.patch
diff -u SOURCES/tcsh-nls-codesets.patch:1.1 SOURCES/tcsh-nls-codesets.patch:1.2
--- SOURCES/tcsh-nls-codesets.patch:1.1 Fri Jun 6 15:20:07 2003
+++ SOURCES/tcsh-nls-codesets.patch Thu Apr 9 11:45:48 2009
@@ -2,7 +2,7 @@
--- tcsh-6.12.00/nls.orig/et/set1 Thu Jan 11 13:25:24 2001
+++ tcsh-6.12.00/nls/et/set1 Fri Jun 6 13:07:05 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.3 2006/03/02 18:46:45 christos Exp $
+$ codeset=iso-8859-1
$ Error messages
$set 1
@@ -11,7 +11,7 @@
--- tcsh-6.12.00/nls.orig/finnish/set1 Mon Sep 3 02:13:26 2001
+++ tcsh-6.12.00/nls/finnish/set1 Fri Jun 6 13:07:28 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.3 2006/03/02 18:46:46 christos Exp $
+$ codeset=iso-8859-1
$ Error messages
$set 1
@@ -20,7 +20,7 @@
--- tcsh-6.12.00/nls.orig/french/set1 Sat Jun 27 12:27:57 1998
+++ tcsh-6.12.00/nls/french/set1 Fri Jun 6 13:07:36 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ codeset=iso-8859-1
$ Messages d 'erreur
$set 1
@@ -29,7 +29,7 @@
--- tcsh-6.12.00/nls.orig/german/set1 Sat Jun 27 12:27:59 1998
+++ tcsh-6.12.00/nls/german/set1 Fri Jun 6 13:07:41 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.6 2006/03/02 18:46:46 christos Exp $
+$ codeset=iso-8859-1
$ Error messages
$set 1
@@ -38,7 +38,7 @@
--- tcsh-6.12.00/nls.orig/greek/set1 Fri Sep 18 15:31:57 1998
+++ tcsh-6.12.00/nls/greek/set1 Fri Jun 6 13:07:53 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.4 2006/03/02 18:46:46 christos Exp $
+$ codeset=iso-8859-7
$ Error messages
$set 1
@@ -47,7 +47,7 @@
--- tcsh-6.12.00/nls.orig/italian/set1 Thu Sep 3 22:03:13 1998
+++ tcsh-6.12.00/nls/italian/set1 Fri Jun 6 13:08:00 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.2 2006/03/02 18:46:47 christos Exp $
+$ codeset=iso-8859-1
$ Error messages
$set 1
@@ -56,7 +56,7 @@
--- tcsh-6.12.00/nls.orig/ja/set1 Tue May 11 13:08:29 1999
+++ tcsh-6.12.00/nls/ja/set1 Fri Jun 6 13:08:52 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.5 2006/03/02 18:46:47 christos Exp $
+$ codeset=euc-jp
$ Error messages
$set 1
@@ -65,7 +65,7 @@
--- tcsh-6.12.00/nls.orig/pl/set1 Fri Mar 8 17:42:33 2002
+++ tcsh-6.12.00/nls/pl/set1 Fri Jun 6 13:09:01 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.5 1998/06/27 12:27:55 christos Exp $
+$ codeset=iso-8859-2
$ Error messages
$set 1
@@ -74,7 +74,7 @@
--- tcsh-6.12.00/nls.orig/russian/set1 Fri Mar 8 17:46:50 2002
+++ tcsh-6.12.00/nls/russian/set1 Fri Jun 6 13:09:31 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.4 2006/03/02 18:46:47 christos Exp $
+$ codeset=iso-8859-5
$ Error messages
$set 1
@@ -83,7 +83,7 @@
--- tcsh-6.12.00/nls.orig/spanish/set1 Sat Jun 27 12:28:02 1998
+++ tcsh-6.12.00/nls/spanish/set1 Fri Jun 6 13:09:39 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ codeset=iso-8859-1
$ Mensajes de Error
$set 1
@@ -92,7 +92,7 @@
--- tcsh-6.12.00/nls.orig/ukrainian/set1 Mon Jul 1 20:50:22 2002
+++ tcsh-6.12.00/nls/ukrainian/set1 Fri Jun 6 13:10:21 2003
@@ -1,4 +1,5 @@
- $ $Id$
+ $ $tcsh: set1,v 1.3 2006/03/02 18:46:48 christos Exp $
+$ codeset=koi8-u
$ Error messages
$set 1
================================================================
Index: SOURCES/tcsh-no_TERMCAP.patch
diff -u SOURCES/tcsh-no_TERMCAP.patch:1.1 SOURCES/tcsh-no_TERMCAP.patch:1.2
--- SOURCES/tcsh-no_TERMCAP.patch:1.1 Sun May 18 05:09:10 2003
+++ SOURCES/tcsh-no_TERMCAP.patch Thu Apr 9 11:45:48 2009
@@ -1,17 +1,17 @@
--- tcsh-6.12.00/ed.screen.c~ Sun May 18 04:50:03 2003
+++ tcsh-6.12.00/ed.screen.c Sun May 18 04:50:03 2003
-@@ -1681,57 +1681,6 @@
- tsetenv(STRLINES, buf);
+@@ -1681,59 +1681,6 @@
+ cleanup_until(p);
}
- if ((tptr = getenv("TERMCAP")) != NULL) {
- /* Leave 64 characters slop in case we enlarge the termcap string */
-- Char termcap[1024+64], backup[1024+64], *ptr;
-- int i;
+- Char termcap[TC_BUFSIZE+64], backup[TC_BUFSIZE+64], *ptr;
+- Char buf[4];
-
- ptr = str2short(tptr);
-- (void) Strncpy(termcap, ptr, 1024);
-- termcap[1023] = '\0';
+- (void) Strncpy(termcap, ptr, TC_BUFSIZE);
+- termcap[TC_BUFSIZE-1] = '\0';
-
- /* update termcap string; first do columns */
- buf[0] = 'c';
@@ -22,11 +22,12 @@
- (void) Strcpy(backup, termcap);
- }
- else {
-- i = (int) (ptr - termcap + Strlen(buf));
-- (void) Strncpy(backup, termcap, (size_t) i);
-- backup[i] = '\0';
-- (void) Itoa(Val(T_co), buf, 0, 0);
-- (void) Strcat(backup + i, buf);
+- size_t len = (ptr - termcap) + Strlen(buf);
+- (void) Strncpy(backup, termcap, len);
+- backup[len] = '\0';
+- p = Itoa(Val(T_co), 0, 0);
+- (void) Strcat(backup + len, p);
+- xfree(p);
- ptr = Strchr(ptr, ':');
- (void) Strcat(backup, ptr);
- }
@@ -40,19 +41,20 @@
- (void) Strcpy(termcap, backup);
- }
- else {
-- i = (int) (ptr - backup + Strlen(buf));
-- (void) Strncpy(termcap, backup, (size_t) i);
-- termcap[i] = '\0';
-- (void) Itoa(Val(T_li), buf, 0, 0);
-- (void) Strcat(termcap, buf);
+- size_t len = (ptr - backup) + Strlen(buf);
+- (void) Strncpy(termcap, backup, len);
+- termcap[len] = '\0';
+- p = Itoa(Val(T_li), 0, 0);
+- (void) Strcat(termcap, p);
+- xfree(p);
- ptr = Strchr(ptr, ':');
- (void) Strcat(termcap, ptr);
- }
- /*
-- * Chop the termcap string at 1024 characters to avoid core-dumps
-- * in the termcap routines
+- * Chop the termcap string at TC_BUFSIZE-1 characters to avoid
+- * core-dumps in the termcap routines
- */
-- termcap[1023] = '\0';
+- termcap[TC_BUFSIZE - 1] = '\0';
- tsetenv(STRTERMCAP, termcap);
- }
}
@@ -67,7 +69,7 @@
- if ((eq(lp, STRNULL) && (eq(vp, STRLINES) || eq(vp, STRCOLUMNS))) ||
- eq(vp, STRTERMCAP)) {
+ if (eq(lp, STRNULL) && (eq(vp, STRLINES) || eq(vp, STRCOLUMNS))) {
- xfree((ptr_t) lp);
+ cleanup_until(lp);
check_window_size(1);
return;
--- tcsh-6.12.00/sh.set.c~ Sun May 18 04:55:02 2003
================================================================
Index: SOURCES/tcsh-rlimit_locks.patch
diff -u SOURCES/tcsh-rlimit_locks.patch:1.2 SOURCES/tcsh-rlimit_locks.patch:1.3
--- SOURCES/tcsh-rlimit_locks.patch:1.2 Sun Sep 5 13:24:56 2004
+++ SOURCES/tcsh-rlimit_locks.patch Thu Apr 9 11:45:49 2009
@@ -14,7 +14,7 @@
@@ -2082,6 +2086,7 @@
# endif /* BSDLIMIT */
RLIM_TYPE limit;
- int div = lp->limdiv;
+ int xdiv = lp->limdiv;
+ int limret;
xprintf("%-13.13s", lp->limname);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tcsh-misc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tcsh-nls-codesets.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tcsh-no_TERMCAP.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tcsh-rlimit_locks.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list