projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ctdlmigrate now uses the new directory semantics
[citadel.git]
/
citadel
/
utils
/
ctdlmigrate.c
diff --git
a/citadel/utils/ctdlmigrate.c
b/citadel/utils/ctdlmigrate.c
index 199772ecc99b21c02e1ff89152209347d0583e63..21dad4b24f87f331956542a95ced05e13db28ace 100644
(file)
--- a/
citadel/utils/ctdlmigrate.c
+++ b/
citadel/utils/ctdlmigrate.c
@@
-5,7
+5,7
@@
* The scope of this program isn't wide enough to make a difference. If you don't like
* it you can rewrite it.
*
* The scope of this program isn't wide enough to make a difference. If you don't like
* it you can rewrite it.
*
- * Copyright (c) 2009-20
16
citadel.org
+ * Copyright (c) 2009-20
21
citadel.org
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
@@
-41,9
+41,6
@@
#include "sysdep.h"
#include "config.h"
#include "citadel_dirs.h"
#include "sysdep.h"
#include "config.h"
#include "citadel_dirs.h"
-#if HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
@@
-69,11
+66,7
@@
void getz(char *buf) {
-int main(int argc, char *argv[])
-{
- int relh=0;
- int home=0;
- char relhome[PATH_MAX]="";
+int main(int argc, char *argv[]) {
char ctdldir[PATH_MAX]=CTDLDIR;
char yesno[5];
char sendcommand[PATH_MAX];
char ctdldir[PATH_MAX]=CTDLDIR;
char yesno[5];
char sendcommand[PATH_MAX];
@@
-90,11
+83,15
@@
int main(int argc, char *argv[])
char spinning[4] = "-\\|/" ;
int exitcode = 0;
char spinning[4] = "-\\|/" ;
int exitcode = 0;
- calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
CtdlMakeTempFileName(socket_path, sizeof socket_path);
CtdlMakeTempFileName(socket_path, sizeof socket_path);
+ if (chdir(ctdldir) != 0) {
+ fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+ exit(errno);
+ }
+
- cmdexit = system("clear");
-
printf(
"-------------------------------------------\n"
+ printf( "\033[2J\033[H\n"
+
"-------------------------------------------\n"
"Over-the-wire migration utility for Citadel\n"
"-------------------------------------------\n"
"\n"
"Over-the-wire migration utility for Citadel\n"
"-------------------------------------------\n"
"\n"
@@
-259,10
+256,6
@@
FAIL: if (sourcefp) pclose(sourcefp);
snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
socket_path, remote_user, remote_host, &buf[5], ctdl_key_dir);
}
snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
socket_path, remote_user, remote_host, &buf[5], ctdl_key_dir);
}
- else if (!strncasecmp(buf, "images|", 7)) {
- snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
- socket_path, remote_user, remote_host, &buf[7], ctdl_image_dir);
- }
else {
strcpy(cmd, "false"); /* cheap and sleazy way to throw an error */
}
else {
strcpy(cmd, "false"); /* cheap and sleazy way to throw an error */
}