diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-02-14 22:23:05 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-02-14 22:23:05 +0000 |
| commit | f7c9550ba3df615a75bceb53219f7dc0a4f84043 (patch) | |
| tree | a294cb8b816704af662c5ffb92f51258d4356785 /app-shells/sash/files | |
| parent | A fix for paralell make, closes #41360. (Manifest recommit) (diff) | |
| download | gentoo-2-f7c9550ba3df615a75bceb53219f7dc0a4f84043.tar.gz gentoo-2-f7c9550ba3df615a75bceb53219f7dc0a4f84043.tar.bz2 gentoo-2-f7c9550ba3df615a75bceb53219f7dc0a4f84043.zip | |
Version bump to 3.7; also fixed the readline patch sourcing issues. Closes bugs #39543 and #32941.
Diffstat (limited to 'app-shells/sash/files')
| -rw-r--r-- | app-shells/sash/files/digest-sash-3.7 | 1 | ||||
| -rw-r--r-- | app-shells/sash/files/sash-3.6-readline.patch | 36 |
2 files changed, 25 insertions, 12 deletions
diff --git a/app-shells/sash/files/digest-sash-3.7 b/app-shells/sash/files/digest-sash-3.7 new file mode 100644 index 000000000000..927cceb6610b --- /dev/null +++ b/app-shells/sash/files/digest-sash-3.7 @@ -0,0 +1 @@ +MD5 ee7c7ed5aad76599974d016a6f201ef4 sash-3.7.tar.gz 50337 diff --git a/app-shells/sash/files/sash-3.6-readline.patch b/app-shells/sash/files/sash-3.6-readline.patch index 2bd7e29d82d3..c30fcb59e4d5 100644 --- a/app-shells/sash/files/sash-3.6-readline.patch +++ b/app-shells/sash/files/sash-3.6-readline.patch @@ -260,11 +260,32 @@ diff -ruN sash-3.6/sash.c sash-3.6.readline/sash.c if (intFlag && !ttyFlag && (fp != stdin)) { fclose(fp); -@@ -596,6 +804,19 @@ - +@@ -805,17 +805,34 @@ return; } + +- if (fgets(buf, CMD_LEN - 1, fp) == NULL) ++#ifdef HAVE_READLINE ++ if (name != NULL) + { +- if (ferror(fp) && (errno == EINTR)) ++#endif ++ if (fgets(buf, CMD_LEN - 1, fp) == NULL) + { +- clearerr(fp); ++ if (ferror(fp) && (errno == EINTR)) ++ { ++ clearerr(fp); ++ continue; ++ } + +- continue; ++ break; + } +- +- break; +#ifdef HAVE_READLINE + } + if (name == NULL) + { + input_line = readline(prompt ? prompt : "$ "); @@ -276,16 +297,7 @@ diff -ruN sash-3.6/sash.c sash-3.6.readline/sash.c + } + free(input_line); + } -+#else - - if (fgets(buf, CMD_LEN - 1, fp) == NULL) - { -@@ -608,7 +829,7 @@ ++#endif - break; - } -- -+#endif cc = strlen(buf); - if (buf[cc - 1] == '\n') |