SHA256
1
0
forked from pool/tcsh
Dr. Werner Fink 2011-02-07 12:46:12 +00:00 committed by Git OBS Bridge
parent 68a7402a32
commit e68ca1e849
4 changed files with 626 additions and 621 deletions

View File

@ -1,6 +1,6 @@
--- sh.c --- sh.c
+++ sh.c 2007-10-15 10:03:11.216084278 +0000 +++ sh.c 2007-10-15 10:03:11.000000000 +0000
@@ -1770,7 +1770,7 @@ static Char *jobargv[2] = {STRjobs, 0} @@ -1811,7 +1811,7 @@ static Char *jobargv[2] = {STRjobs, 0}
* and finally go through the normal error mechanism, which * and finally go through the normal error mechanism, which
* gets a chance to make the shell go away. * gets a chance to make the shell go away.
*/ */
@ -10,7 +10,7 @@
void void
pintr(void) pintr(void)
--- sh.err.c --- sh.err.c
+++ sh.err.c 2009-03-25 10:35:16.552001834 +0000 +++ sh.err.c 2009-03-25 10:35:17.000000000 +0000
@@ -51,6 +51,7 @@ char *seterr = NULL; /* Holds last err @@ -51,6 +51,7 @@ char *seterr = NULL; /* Holds last err
#define ERR_NAME 0x10000000 #define ERR_NAME 0x10000000
#define ERR_SILENT 0x20000000 #define ERR_SILENT 0x20000000
@ -19,8 +19,8 @@
#define ERR_SYNTAX 0 #define ERR_SYNTAX 0
#define ERR_NOTALLOWED 1 #define ERR_NOTALLOWED 1
@@ -609,7 +610,8 @@ stderror(unsigned int id, ...) @@ -608,7 +609,8 @@ stderror(unsigned int id, ...)
* sh.print.c. * will go to 1/2 else to FSHOUT/FSHDIAG. See flush in sh.print.c.
*/ */
flush();/*FIXRESET*/ flush();/*FIXRESET*/
- haderr = 1; /* Now to diagnostic output */ - haderr = 1; /* Now to diagnostic output */
@ -29,7 +29,7 @@
if (flags & ERR_NAME) if (flags & ERR_NAME)
xprintf("%s: ", bname);/*FIXRESET*/ xprintf("%s: ", bname);/*FIXRESET*/
if ((flags & ERR_OLD)) { if ((flags & ERR_OLD)) {
@@ -650,5 +652,6 @@ stderror(unsigned int id, ...) @@ -649,5 +651,6 @@ stderror(unsigned int id, ...)
if (tpgrp > 0) if (tpgrp > 0)
(void) tcsetpgrp(FSHTTY, tpgrp); (void) tcsetpgrp(FSHTTY, tpgrp);
#endif #endif
@ -39,7 +39,7 @@
} }
--- sh.h --- sh.h
+++ sh.h 2007-10-11 22:00:00.000000000 +0000 +++ sh.h 2007-10-11 22:00:00.000000000 +0000
@@ -548,6 +548,7 @@ EXTERN int neednote IZERO; /* Need to @@ -565,6 +565,7 @@ EXTERN int neednote IZERO; /* Need to
EXTERN int noexec IZERO; /* Don't execute, just syntax check */ EXTERN int noexec IZERO; /* Don't execute, just syntax check */
EXTERN int pjobs IZERO; /* want to print jobs if interrupted */ EXTERN int pjobs IZERO; /* want to print jobs if interrupted */
EXTERN int setintr IZERO; /* Set interrupts on/off -> Wait intr... */ EXTERN int setintr IZERO; /* Set interrupts on/off -> Wait intr... */
@ -49,9 +49,9 @@
EXTERN int noediting IZERO; /* initial $term defaulted to noedit */ EXTERN int noediting IZERO; /* initial $term defaulted to noedit */
--- sh.hist.c --- sh.hist.c
+++ sh.hist.c 2007-10-11 22:00:00.000000000 +0000 +++ sh.hist.c 2007-10-11 22:00:00.000000000 +0000
@@ -425,9 +425,9 @@ rechist(Char *fname, int ref) @@ -1279,9 +1279,9 @@ rechist(Char *fname, int ref)
if (shist->vec[1] && eq(shist->vec[1], STRmerge)) setv(STRverbose, verb, VAR_READWRITE);
loadhist(fname, 1); }
fp = xcreat(short2str(fname), 0600); fp = xcreat(short2str(fname), 0600);
+ cleanup_until(fname); + cleanup_until(fname);
if (fp == -1) { if (fp == -1) {
@ -60,7 +60,7 @@
return; return;
} }
ftmp = SHOUT; ftmp = SHOUT;
@@ -437,7 +437,6 @@ rechist(Char *fname, int ref) @@ -1291,7 +1291,6 @@ rechist(Char *fname, int ref)
xclose(fp); xclose(fp);
SHOUT = ftmp; SHOUT = ftmp;
didfds = oldidfds; didfds = oldidfds;
@ -69,7 +69,7 @@
--- sh.print.c --- sh.print.c
+++ sh.print.c 2007-10-15 10:09:15.994329114 +0000 +++ sh.print.c 2007-10-15 10:09:16.000000000 +0000
@@ -222,7 +222,8 @@ drainoline(void) @@ -222,7 +222,8 @@ drainoline(void)
void void
flush(void) flush(void)

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 7 12:45:48 UTC 2011 - werner@suse.de
- Renew some patches to make it build
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 14 18:20:38 CET 2010 - werner@suse.de Tue Dec 14 18:20:38 CET 2010 - werner@suse.de

View File

@ -38,7 +38,7 @@ Patch2: tcsh-6.15.00-utf8.dif
Patch3: tcsh-6.15.00-pipe.dif Patch3: tcsh-6.15.00-pipe.dif
Patch4: tcsh-6.17.00-longjmp.dif Patch4: tcsh-6.17.00-longjmp.dif
Patch5: tcsh-6.16.00-norm-cmd.dif Patch5: tcsh-6.16.00-norm-cmd.dif
Patch6: tcsh-6.16.00-history.dif Patch6: tcsh-6.17.02-history.dif
Patch7: tcsh-6.15.00-blanks.dif Patch7: tcsh-6.15.00-blanks.dif
Patch8: tcsh-6.15.00-fullpath.dif Patch8: tcsh-6.15.00-fullpath.dif
Patch9: tcsh-6.17.02-multibyte.patch Patch9: tcsh-6.17.02-multibyte.patch
@ -78,7 +78,7 @@ Authors:
%patch11 -p0 -b .mailbox %patch11 -p0 -b .mailbox
%patch12 -p1 -b .catalog %patch12 -p1 -b .catalog
%patch13 -p0 -b .kanji %patch13 -p0 -b .kanji
%patch %patch -b .0
sh $RPM_SOURCE_DIR/nls-iconv sh $RPM_SOURCE_DIR/nls-iconv
%build %build