diff options
author | Richard Levitte <levitte@openssl.org> | 2018-04-20 12:22:45 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-04-25 11:44:26 +0200 |
commit | 96de2e590bad00575baa7c2c6be5767b43aa017c (patch) | |
tree | 194cbfff3493b1844e6e6100c9800a85563d12f6 /apps/apps.c | |
parent | b47b6650164711de449a7738112a3efb733213e2 (diff) |
Revert "Check directory is able to create files for various -out option"
This reverts commit 555c94a0db9661428da0a45cb32b9f002324eefd.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6033)
Diffstat (limited to 'apps/apps.c')
-rw-r--r-- | apps/apps.c | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/apps/apps.c b/apps/apps.c index 2ab65b7213..b35ea563ee 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -2364,73 +2364,6 @@ int app_isdir(const char *name) } #endif -/* app_dirname section */ - -/* - * This exactly follows what POSIX's - * dirname does, but is implemented - * in a more platform independent way. - * - * path dirname - * /usr/lib /usr - * /usr/ / - * usr . - * / / - * . . - * .. . - * "" . - * - * Note: this function also keeps the - * possibility of modifying the 'path' - * string same as POSIX dirname. - */ -static char *posix_dirname(char *path) -{ - size_t l; - char *ret = "."; - - l = strlen(path); - if (l == 0) - goto out; - if (strcmp(path, ".") == 0) - goto out; - if (strcmp(path, "..") == 0) - goto out; - if (strcmp(path, "/") == 0) { - ret = "/"; - goto out; - } - if (path[l - 1] == '/') { - /* /usr/ */ - path[l - 1] = '\0'; - } - if ((ret = strrchr(path, '/')) == NULL) { - /* usr */ - ret = "."; - } else if (ret == path) { - /* /usr */ - *++ret = '\0'; - ret = path; - } else { - /* /usr/lib */ - *ret = '\0'; - ret = path; - } - out: - return ret; -} - -/* - * TODO: implement app_dirname for Windows - * and VMS. - */ -#if !defined(_WIN32) && !defined(__VMS) -char *app_dirname(char *path) -{ - return posix_dirname(path); -} -#endif - /* raw_read|write section */ #if defined(__VMS) # include "vms_term_sock.h" |