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/php-5_3/xdebug/patches/xdebug-usefulstuff_c.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Thu, 31 May 2012 14:36:45 -0700
changeset 846 fe258446a1ae
permissions -rw-r--r--
6714149 integrate PHP 5.3 within OpenSolaris
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
846
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     1
 
--- xdebug-2.1.3/usefulstuff.c_orig	Thu Jan 26 01:48:14 2012
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     2
 
+++ xdebug-2.1.3/usefulstuff.c	Thu Feb  9 15:33:34 2012
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     3
 
@@ -429,7 +429,6 @@
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     4
 
 	FILE *fh;
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     5
 
 	struct stat buf;
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     6
 
 	char *tmp_fname = NULL;
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     7
 
-	int   filename_len = 0;
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     8
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     9
 
 	/* We're not doing any tricks for append mode... as that has atomic writes
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    10
 
 	 * anyway. And we ignore read mode as well. */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    11
 
@@ -437,14 +436,6 @@
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    12
 
 		return xdebug_open_file(fname, mode, extension, new_fname);
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    13
 
 	}
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    14
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    15
 
-	/* Make sure we don't open a file with a path that's too long */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    16
 
-	filename_len += (fname ? strlen(fname) : 0); /* filename */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    17
 
-	filename_len += (extension ? strlen(extension) : 0) + 1; /* extension (+ ".") */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    18
 
-	filename_len += 8; /* possible random extension (+ ".") */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    19
 
-	if (filename_len > NAME_MAX) {
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    20
 
-		fname[NAME_MAX - (extension ? strlen(extension) : 0 )] = '\0';
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    21
 
-	}
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    22
 
-
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    23
 
 	/* In write mode however we do have to do some stuff. */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    24
 
 	/* 1. Check if the file exists */
fe258446a1ae 6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
    25
 
 	if (extension) {
upstream/oracle/userland-gate