diff options
| -rw-r--r-- | math/sc/files/patch-cmds.c | 32 | ||||
| -rw-r--r-- | math/sc/files/patch-crypt.c | 41 | 
2 files changed, 73 insertions, 0 deletions
diff --git a/math/sc/files/patch-cmds.c b/math/sc/files/patch-cmds.c new file mode 100644 index 000000000000..beb50ff4688a --- /dev/null +++ b/math/sc/files/patch-cmds.c @@ -0,0 +1,32 @@ +--- cmds.c.orig	2011-07-25 22:13:45.000000000 +0200 ++++ cmds.c	2011-07-25 22:13:47.000000000 +0200 +@@ -2861,12 +2861,12 @@ writefile(char *fname, int r0, int c0, i + 	if ((plugin = findplugin(p+1, 'w')) != NULL) { + 	    if (!plugin_exists(plugin, strlen(plugin), save + 1)) { + 		error("plugin not found"); +-		return; ++		return (-1); + 	    } + 	    *save = '|'; + 	    if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { + 		error("Path too long"); +-		return; ++		return (-1); + 	    } + 	    sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); + 	    sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); +@@ -2981,12 +2981,12 @@ readfile(char *fname, int eraseflg) + 	if ((plugin = findplugin(p+1, 'r')) != NULL) { + 	    if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { + 		error("plugin not found"); +-		return; ++		return (-1); + 	    } + 	    *save = '|'; + 	    if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { + 		error("Path too long"); +-		return; ++		return (-1); + 	    } + 	    sprintf(save + strlen(save), " \"%s\"", fname); + 	    eraseflg = 0; diff --git a/math/sc/files/patch-crypt.c b/math/sc/files/patch-crypt.c new file mode 100644 index 000000000000..210496019c96 --- /dev/null +++ b/math/sc/files/patch-crypt.c @@ -0,0 +1,41 @@ +--- crypt.c.orig	2011-07-25 22:15:54.000000000 +0200 ++++ crypt.c	2011-07-25 22:15:56.000000000 +0200 +@@ -32,18 +32,18 @@ creadfile(char *save, int  eraseflg) +     int fildes; +     int pid; +  +-    if (eraseflg && strcmp(save, curfile) && modcheck(" first")) return; ++    if (eraseflg && strcmp(save, curfile) && modcheck(" first")) return (0); +  +     if ((fildes = open(findhome(save), O_RDONLY, 0)) < 0) { + 	error ("Can't read file \"%s\"", save); +-	return; ++	return (-1); +     } +  +     if (eraseflg) erasedb(); +  +     if (pipe(pipefd) < 0) { + 	error("Can't make pipe to child"); +-	return; ++	return (-1); +     } +  +     deraw(1); +@@ -68,7 +68,7 @@ creadfile(char *save, int  eraseflg) + 	    (void) kill(pid, 9); + 	    error("Can't fdopen file \"%s\"", save); + 	    (void)close(pipefd[0]); +-	    return; ++	    return (-1); + 	} +     } +  +@@ -86,6 +86,7 @@ creadfile(char *save, int  eraseflg) + 	(void) strcpy(curfile, save); + 	modflg = 0; +     } ++    return (0); + } +  + int  | 
