aboutsummaryrefslogtreecommitdiff
path: root/src/os_unix.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2006-02-13 18:42:21 +0000
committerdrh <drh@noemail.net>2006-02-13 18:42:21 +0000
commit4eb9a9792acd497a68024025fcfee731840f9780 (patch)
tree8e7b786767796a867aae03365c2462e8c702e5f5 /src/os_unix.c
parent97bbdc0aa29697c96279126494da2eb22cf4bb01 (diff)
downloadsqlite-4eb9a9792acd497a68024025fcfee731840f9780.tar.gz
sqlite-4eb9a9792acd497a68024025fcfee731840f9780.zip
Disable the /./ and /../ collapser logic in sqlite3OsFullPathname under Unix. (CVS 3092)
FossilOrigin-Name: 111a426b3e2fae77c9e6c3cd903fd80652b23720
Diffstat (limited to 'src/os_unix.c')
-rw-r--r--src/os_unix.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 6621625ac..ce3101ed1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1539,7 +1539,6 @@ static int unixClose(OsFile **pId){
*/
char *sqlite3UnixFullPathname(const char *zRelative){
char *zFull = 0;
- int i, j;
if( zRelative[0]=='/' ){
sqlite3SetString(&zFull, zRelative, (char*)0);
}else{
@@ -1552,11 +1551,14 @@ char *sqlite3UnixFullPathname(const char *zRelative){
(char*)0);
sqliteFree(zBuf);
}
+
+#if 0
/*
** Remove "/./" path elements and convert "/A/./" path elements
** to just "/".
*/
if( zFull ){
+ int i, j;
for(i=j=0; zFull[i]; i++){
if( zFull[i]=='/' ){
if( zFull[i+1]=='/' ) continue;
@@ -1574,6 +1576,8 @@ char *sqlite3UnixFullPathname(const char *zRelative){
}
zFull[j] = 0;
}
+#endif
+
return zFull;
}