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/tcsh/patches/004.tcsh-6.14.00-avoid_null_for_cwd.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Fri, 04 Nov 2011 05:41:01 -0700
branchs11-sru
changeset 2229 c7d4ae552733
parent 218 2659b05538d8
permissions -rw-r--r--
7107506 Upgrade Wireshark to version 1.4.10 7107505 Problem with network/wireshark 7096540 Problem with network/wireshark 7088891 Problem with network/wireshark
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
218
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     1
 
diff -up tcsh-6.14.00/sh.proc.c.orig tcsh-6.14.00/sh.proc.c
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     2
 
--- tcsh-6.14.00/sh.proc.c.orig	2010-09-08 10:31:31.000000000 +0200
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     3
 
+++ tcsh-6.14.00/sh.proc.c	2010-09-08 10:48:07.996573506 +0200
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
 
@@ -396,7 +396,7 @@ found:
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
 #ifdef notdef
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
 
 		jobflags & PAEXITED ||
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
 #endif /* notdef */
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
-		!eq(dcwd->di_name, fp->p_cwd->di_name))) {
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
+		fp->p_cwd == NULL || !eq(dcwd->di_name, fp->p_cwd->di_name))) {
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
 	    /* PWP: print a newline after ^C */
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
 
 		if (jobflags & PINTERRUPTED) {
2659b05538d8 7042150 Problem with utility/tcsh
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
 #ifdef SHORT_STRINGS
upstream/oracle/userland-gate