Mercurial Mercurial > upstream > oracle > spec-files / 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.
patches/gftp-08-url_prefix-null.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18110 93461edb1490
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18110
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
--- gftp-2.0.19/lib/cache.c.orig	2008-12-23 15:40:43.800541719 +0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
+++ gftp-2.0.19/lib/cache.c	2008-12-23 15:41:03.680208360 +0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
@@ -107,7 +107,7 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
                                  size_t len, int ignore_directory)
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
 
 {
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
   g_snprintf (description, len, "%s://%s@%s:%d%s",
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
 
-              request->url_prefix,
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
 
+              request->url_prefix == NULL ? "" : request->url_prefix,
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
 
               request->username == NULL ? "" : request->username,
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
 
               request->hostname == NULL ? "" : request->hostname,
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    11
 
               request->port,
upstream/oracle/spec-files