Attachment 606398 Details for Bug 847102 – Alternate patch for dosource()

[patch] Alternate patch for dosource()

tcsh-6.17.00-history-file-locking2.patch (text/plain), 1.79 KB, created by Bob Arendt on 2012-08-22 22:31:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Arendt

Created: 2012-08-22 22:31:12 UTC

Size: 1.79 KB

patch

obsolete

>diff -Bburp tcsh-6.17.00_orig/sh.c tcsh-6.17.00/sh.c
>--- tcsh-6.17.00_orig/sh.c	2012-08-22 09:35:13.815182201 -0700
>+++ tcsh-6.17.00/sh.c	2012-08-22 14:30:28.860521696 -0700
>@@ -2062,7 +2062,11 @@ process(int catch)
> 
> /*ARGSUSED*/
> int
>-dosource(Char **t, struct command *c, int flg)
>+dosource(Char **t, struct command *c)
>+{ return dosource_lck(t, c, 0); }
>+
>+int
>+dosource_lck(Char **t, struct command *c, int flg)
> {
>     Char *f;
>     char *file;
>diff -Bburp tcsh-6.17.00_orig/sh.decls.h tcsh-6.17.00/sh.decls.h
>--- tcsh-6.17.00_orig/sh.decls.h	2012-08-22 09:35:13.815182201 -0700
>+++ tcsh-6.17.00/sh.decls.h	2012-08-22 14:27:00.823837837 -0700
>@@ -37,7 +37,8 @@
>  * sh.c
>  */
> extern	Char	 	 *gethdir	(const Char *);
>-extern	int		  dosource	(Char **, struct command *, int);
>+extern	int		  dosource	(Char **, struct command *);
>+extern	int		  dosource_lck	(Char **, struct command *, int);
> extern	void		  exitstat	(void);
> extern	void		  goodbye	(Char **, struct command *);
> extern	void		  importpath	(Char *);
>diff -Bburp tcsh-6.17.00_orig/sh.dir.c tcsh-6.17.00/sh.dir.c
>--- tcsh-6.17.00_orig/sh.dir.c	2012-08-22 09:35:13.816182194 -0700
>+++ tcsh-6.17.00/sh.dir.c	2012-08-22 14:27:00.824837830 -0700
>@@ -1336,7 +1336,7 @@ loaddirs(Char *fname)
> 	loaddirs_cmd[1] = fname;
>     else
> 	loaddirs_cmd[1] = STRtildotdirs;
>-    dosource(loaddirs_cmd, NULL, 0);
>+    dosource_lck(loaddirs_cmd, NULL, 0);
>     cleanup_until(&bequiet);
> }
> 
>diff -Bburp tcsh-6.17.00_orig/sh.hist.c tcsh-6.17.00/sh.hist.c
>--- tcsh-6.17.00_orig/sh.hist.c	2012-08-22 09:35:13.818182180 -0700
>+++ tcsh-6.17.00/sh.hist.c	2012-08-22 14:27:00.825837823 -0700
>@@ -460,5 +460,5 @@ loadhist(Char *fname, int flg)
>     else
> 	loadhist_cmd[2] = STRtildothist;
> 
>-    return dosource(loadhist_cmd, NULL, flg);
>+    return dosource_lck(loadhist_cmd, NULL, flg);
> }

Actions: View | Diff

Attachments on bug 847102: 606312 | 606398