Hi,
> Just put the attached pvfs2-mv.c into src/apps/admin, hook it up in
> src/apps/admin/module.mk.in and you're good to go.
I just noticed that the file I sent actually had some local
modifications in it and therefore didn't work with HEAD. Sorry about
that.
I'm attaching a fixed version.
Regards, Michael
/*
* (C) 2001 Clemson University and The University of Chicago
* (C) 2007 Michael Kuhn
*
* See COPYING in top-level directory.
*/
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/time.h>
#include <time.h>
#include <stdlib.h>
#include <getopt.h>
#include "pvfs2.h"
#include "str-utils.h"
#ifndef PVFS2_VERSION
#define PVFS2_VERSION "Unknown"
#endif
/* optional parameters, filled in by parse_args() */
struct options
{
uint32_t num_files;
char **filenames;
};
static struct options *parse_args(int argc, char **argv);
static void usage(int argc, char **argv);
int main(int argc, char **argv)
{
int ret = -1, i = 0;
struct options *user_opts = NULL;
char filenames[2][PVFS_SEGMENT_MAX];
PVFS_object_ref parent_refs[2];
PVFS_credentials credentials;
/* look at command line arguments */
user_opts = parse_args(argc, argv);
if(!user_opts)
{
fprintf(stderr, "Error: failed to parse command line arguments.\n");
return(-1);
}
/* Initialize the pvfs2 server */
ret = PVFS_util_init_defaults();
if(ret < 0)
{
PVFS_perror("PVFS_util_init_defaults", ret);
return -1;
}
PVFS_util_gen_credentials(&credentials);
for (i = 0; i < user_opts->num_files; ++i)
{
if (i >= 2)
{
fprintf(stderr, "Ignoring %s\n", user_opts->filenames[i]);
continue;
}
int rc;
int num_segs;
char *working_file = user_opts->filenames[i];
char directory[PVFS_NAME_MAX];
char pvfs_path[PVFS_NAME_MAX] = {0};
PVFS_fs_id cur_fs;
PVFS_sysresp_lookup resp_lookup;
/* Translate path into pvfs2 relative path */
rc = PINT_get_base_dir(working_file, directory, PVFS_NAME_MAX);
num_segs = PINT_string_count_segments(working_file);
rc = PINT_get_path_element(working_file, num_segs - 1,
filenames[i], PVFS_SEGMENT_MAX);
if (rc)
{
fprintf(stderr, "Unknown path format: %s\n", working_file);
ret = -1;
break;
}
rc = PVFS_util_resolve(directory, &cur_fs,
pvfs_path, PVFS_NAME_MAX);
if (rc)
{
PVFS_perror("PVFS_util_resolve", rc);
ret = -1;
break;
}
memset(&resp_lookup, 0, sizeof(PVFS_sysresp_lookup));
rc = PVFS_sys_lookup(cur_fs, pvfs_path, &credentials,
&resp_lookup, PVFS2_LOOKUP_LINK_NO_FOLLOW);
if (rc)
{
PVFS_perror("PVFS_sys_lookup", rc);
ret = -1;
break;
}
parent_refs[i] = resp_lookup.ref;
}
if (!ret)
{
ret = PVFS_sys_rename(filenames[0],
parent_refs[0],
filenames[1],
parent_refs[1],
&credentials);
}
if (ret)
{
fprintf(stderr, "Error: An error occurred while renaming %s to %s\n",
user_opts->filenames[0], user_opts->filenames[1]);
PVFS_perror("PVFS_sys_rename", ret);
}
PVFS_sys_finalize();
free(user_opts);
return ret;
}
/* parse_args()
*
* parses command line arguments
*
* returns pointer to options structure on success, NULL on failure
*/
static struct options* parse_args(int argc, char **argv)
{
int one_opt = 0;
char flags[] = "?";
struct options *tmp_opts = NULL;
tmp_opts = (struct options *)malloc(sizeof(struct options));
if(!tmp_opts)
{
return NULL;
}
memset(tmp_opts, 0, sizeof(struct options));
tmp_opts->filenames = 0;
while((one_opt = getopt(argc, argv, flags)) != EOF)
{
switch(one_opt)
{
case('?'):
usage(argc, argv);
exit(EXIT_FAILURE);
}
}
if (optind + 1 < argc)
{
int i = 0;
tmp_opts->num_files = argc - optind;
tmp_opts->filenames = malloc((argc - optind) * sizeof(char*));
while (optind < argc)
{
tmp_opts->filenames[i] = argv[optind];
optind++;
i++;
}
}
else
{
usage(argc, argv);
exit(EXIT_FAILURE);
}
return tmp_opts;
}
static void usage(int argc, char **argv)
{
fprintf(stderr, "Usage: %s old_filename new_filename\n", argv[0]);
}
/*
* Local variables:
* c-indent-level: 4
* c-basic-offset: 4
* End:
*
* vim: ts=8 sts=4 sw=4 expandtab
*/
_______________________________________________
Pvfs2-developers mailing list
[email protected]
http://www.beowulf-underground.org/mailman/listinfo/pvfs2-developers
