Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/solaris-022.bash.sighup.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Fri, 27 Feb 2015 09:41:59 -0800
changeset 3871 ddf9e355ac16
child 5518 c47fe0edc204
permissions -rw-r--r--
15646021 problem in UTILITY/BASH 20597159 bash builtin test returns wrong result for executable test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3871
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Internal patch. Upstream will not accept it.
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# If read EOF on a non-blank line do not interpret as a NL.
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# Clear the readline buffers and return eof_found.
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
--- lib/readline/readline.c	2009-08-31 05:45:31.000000000 -0700
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
+++ lib/readline/readline.c	2015-02-18 11:10:55.652803033 -0800
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
@@ -533,7 +533,15 @@
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
       /* EOF typed to a non-blank line is a <NL>. */
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
       if (c == EOF && rl_end)
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
-	c = NEWLINE;
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+      {
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+        _rl_internal_char_cleanup ();
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
+        eof_found = 1;
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
+#if defined (READLINE_CALLBACKS)
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
+        return 0;
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
+#else
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
+        return (eof_found);
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
+#endif
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
+      }
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
       /* The character _rl_eof_char typed to blank line, and not as the
ddf9e355ac16 15646021 problem in UTILITY/BASH
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
 	 previous character is interpreted as EOF. */
upstream/oracle/userland-gate