Skip to content

libnfs: drop trailing '/' from path in mkdir and rmdir #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

libnfs: drop trailing '/' from path in mkdir and rmdir #516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/aiori-LIBNFS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "aiori-LIBNFS.h"
#include "aiori.h"
#include "aiori-debug.h"
#include "utilities.h"

static struct nfs_context *nfs_context;

Expand Down Expand Up @@ -146,18 +147,43 @@ void LIBNFS_XferHints(aiori_xfer_hint_t * params) {
}

int LIBNFS_MakeDirectory(const char *path, mode_t mode, aiori_mod_opt_t * module_options) {
if (nfs_mkdir2(nfs_context, path, mode)) {
ERRF("Error while creating directory \n nfs error: %s\n", nfs_get_error(nfs_context));

char *path_copy = strdup(path);
if (path_copy == NULL) {
ERR("Failed to create copy of path\n");
}

// remove trailing '/'
if (path_copy[strlen(path_copy) -1] == '/') {
path_copy[strlen(path_copy) -1] = '\0';
}

if (nfs_mkdir2(nfs_context, path_copy, mode)) {
free(path_copy);
ERRF("Error while creating directory \n nfs error: %s\n", nfs_get_error(nfs_context));
}

free(path_copy);
return 0;
}

int LIBNFS_RemoveDirectory(const char *path, aiori_mod_opt_t * module_options) {
if (nfs_rmdir(nfs_context, path)) {
char * path_copy = strdup(path);
if (path_copy == NULL) {
ERR("Failed to create copy of path\n");
}

// remove trailing '/'
if (path_copy[strlen(path_copy) -1] == '/') {
path_copy[strlen(path_copy) -1] = '\0';
}

if (nfs_rmdir(nfs_context, path_copy)) {
free(path_copy);
ERRF("Error while removing directory \n nfs error: %s\n", nfs_get_error(nfs_context));
}

free(path_copy);
return 0;
}

Expand Down