diff options
author | Richard Levitte <levitte@openssl.org> | 2005-11-01 07:49:45 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2005-11-01 07:49:45 +0000 |
commit | d6f25d70f165415c87b4f2a85756397818d930d2 (patch) | |
tree | f3fec666bb8f4fbe2ff1a45429e0980bf8936d98 /crypto | |
parent | b02da8eb50b1bedd11e7aef09813c010c0662360 (diff) |
Fix numerous bugs in the Win32 path splitter
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/dso/dso_win32.c | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index d268c3e18d..e41733097a 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -313,6 +313,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, struct file_st *result = NULL; enum { IN_NODE, IN_DEVICE, IN_FILE } position; const char *start = filename; + char last; if (!filename) { @@ -343,7 +344,8 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, do { - switch(filename[0]) + last = filename[0]; + switch(last) { case ':': if(position != IN_DEVICE) @@ -368,10 +370,19 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, start = ++filename; result->dir = start; } + else if(position == IN_DEVICE) + { + position = IN_FILE; + filename++; + result->dir = start; + result->dirlen = filename - start; + start = filename; + } else { filename++; result->dirlen += filename - start; + start = filename; } break; case '\0': @@ -385,12 +396,19 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, { if (assume_last_is_dir) { - result->devicelen += filename - start; + if (position == IN_DEVICE) + { + result->dir = start; + result->dirlen = 0; + } + result->dirlen += + filename - start; } else { result->file = start; - result->filelen = filename - start; + result->filelen = + filename - start; } } } @@ -400,7 +418,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename, break; } } - while(*filename); + while(last); if(!result->nodelen) result->node = NULL; if(!result->devicelen) result->device = NULL; @@ -488,10 +506,13 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split) result[offset] = '\\'; offset++; start = end + 1; } +#if 0 /* Not needed, since the directory converter above already appeneded + a backslash */ if(file_split->predir && (file_split->dir || file_split->file)) { result[offset] = '\\'; offset++; } +#endif start = file_split->dir; while(file_split->dirlen > (start - file_split->dir)) { @@ -506,10 +527,13 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split) result[offset] = '\\'; offset++; start = end + 1; } +#if 0 /* Not needed, since the directory converter above already appeneded + a backslash */ if(file_split->dir && file_split->file) { result[offset] = '\\'; offset++; } +#endif strncpy(&result[offset], file_split->file, file_split->filelen); offset += file_split->filelen; result[offset] = '\0'; @@ -560,7 +584,7 @@ static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2 return(NULL); } filespec2_split = win32_splitter(dso, filespec2, 0); - if (!filespec1_split) + if (!filespec2_split) { DSOerr(DSO_F_WIN32_MERGER, ERR_R_MALLOC_FAILURE); |