diff options
Diffstat (limited to 'www/cadaver/files/patch-src-commands.c')
| -rw-r--r-- | www/cadaver/files/patch-src-commands.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/www/cadaver/files/patch-src-commands.c b/www/cadaver/files/patch-src-commands.c index 74e3f87cbf5b..cf0096160ac9 100644 --- a/www/cadaver/files/patch-src-commands.c +++ b/www/cadaver/files/patch-src-commands.c @@ -1,6 +1,7 @@ ---- src/commands.c 2008-11-11 03:40:54.000000000 -0500 -+++ src/commands.c 2010-04-16 14:31:42.000000000 -0400 -@@ -71,6 +71,5 @@ +--- src/commands.c.orig 2022-10-30 10:46:52 UTC ++++ src/commands.c +@@ -70,8 +70,7 @@ + #include <ne_dates.h> #include "i18n.h" -#include "basename.h" @@ -8,7 +9,9 @@ +#include <libgen.h> #include "cadaver.h" #include "commands.h" -@@ -765,9 +764,9 @@ + #include "options.h" +@@ -771,17 +770,17 @@ static char *clever_path(const char *p, const char *sr + dest_is_coll = (dest[strlen(dest)-1] == '/'); src_is_coll = (src[strlen(src)-1] == '/'); if (strcmp(dest, ".") == 0) { - ret = resolve_path(p, base_name(src), false); @@ -20,44 +23,54 @@ + ret = resolve_path(parent, basename(src), false); free(parent); } else if (!src_is_coll && dest_is_coll) { -@@ -775,5 +774,5 @@ + /* Moving a file to a collection... the destination should * be the basename of file concated with the collection. */ char *tmp = resolve_path(p, dest, true); - char *enc = escape_path(base_name(src)); + char *enc = escape_path(basename(src)); ret = ne_concat(tmp, enc, NULL); free(enc); -@@ -950,5 +949,5 @@ + free(tmp); +@@ -979,7 +978,7 @@ static void execute_get(const char *remote, const char + if (local == NULL) { struct stat st; /* Choose an appropriate local filename */ - if (stat(base_name(remote), &st) == 0) { + if (stat(basename(remote), &st) == 0) { char buf[BUFSIZ]; /* File already exists... don't overwrite */ -@@ -962,5 +961,5 @@ + snprintf(buf, BUFSIZ, _("Enter local filename for `%s': "), +@@ -992,7 +991,7 @@ static void execute_get(const char *remote, const char + return; } } else { - filename = ne_strdup(base_name(remote)); + filename = ne_strdup(basename(remote)); } } else { -@@ -1004,5 +1003,5 @@ + filename = ne_strdup(local); +@@ -1035,7 +1034,7 @@ static void execute_put(const char *local, const char + { char *real_remote; if (remote == NULL) { - real_remote = resolve_path(session.uri.path, base_name(local), false); + real_remote = resolve_path(session.uri.path, basename(local), false); } else { real_remote = resolve_path(session.uri.path, remote, false); ---- src/edit.c 2008-10-24 07:36:41.000000000 -0400 -+++ src/edit.c 2010-04-16 14:37:24.000000000 -0400 -@@ -117,5 +117,5 @@ + } +--- src/edit.c.orig 2022-10-30 10:46:52 UTC ++++ src/edit.c +@@ -116,7 +116,7 @@ void execute_edit(const char *remote) + struct ne_lock *lock = NULL; char fname[PATH_MAX] = "/tmp/cadaver-edit-XXXXXX"; const char *pnt; - int fd; + int fd, sufx_len; int is_checkout, is_checkin; -@@ -141,7 +141,9 @@ + real_remote = resolve_path(session.uri.path, remote, false); +@@ -140,9 +140,11 @@ void execute_edit(const char *remote) + if (pnt != NULL && strchr(pnt, '/') == NULL) { strncat(fname, pnt, PATH_MAX); fname[PATH_MAX-1] = '\0'; - } @@ -69,3 +82,4 @@ + fd = mkstemps(fname, sufx_len); if (fd == -1) { printf(_("Could not create temporary file %s:\n%s\n"), fname, + strerror(errno)); |