ports/libssh
ports/libssh
1
1
Форкнуть 0
Код Релизы 1 Активность

examples: Fix libssh_scp.c code style

Просмотр исходного кода 
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
Anderson Toshiyuki Sasaki 2018-09-25 16:31:52 +02:00 коммит произвёл Andreas Schneider
родитель 00e5ef1b3c
Коммит 6118628424
1 изменённых файлов: 322 добавлений и 277 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

599
examples/libssh_scp.c
Просмотреть файл

@ -25,62 +25,68 @@ program.
static char **sources; static char **sources;
static int nsources; static int nsources;
static char *destination; static char *destination;
static int verbosity=0; static int verbosity = 0;
struct location { struct location {
int is_ssh; int is_ssh;
char *user; char *user;
char *host; char *host;
char *path; char *path;
ssh_session session; ssh_session session;
ssh_scp scp; ssh_scp scp;
FILE *file; FILE *file;
}; };
enum { enum {
READ, READ,
WRITE WRITE
}; };
static void usage(const char *argv0){ static void usage(const char *argv0) {
fprintf(stderr,"Usage : %s [options] [[user@]host1:]file1 ... \n" fprintf(stderr, "Usage : %s [options] [[user@]host1:]file1 ... \n"
" [[user@]host2:]destination\n" " [[user@]host2:]destination\n"
"sample scp client - libssh-%s\n", "sample scp client - libssh-%s\n",
// "Options :\n", // "Options :\n",
// " -r : use RSA to verify host public key\n", // " -r : use RSA to verify host public key\n",
argv0, argv0,
ssh_version(0)); ssh_version(0));
exit(0); exit(0);
} }
static int opts(int argc, char **argv){ static int opts(int argc, char **argv) {
int i; int i;
while((i=getopt(argc,argv,"v"))!=-1){
switch(i){ while((i = getopt(argc, argv, "v")) != -1) {
case 'v': switch(i) {
verbosity++; case 'v':
break; verbosity++;
default: break;
fprintf(stderr,"unknown option %c\n",optopt); default:
fprintf(stderr, "unknown option %c\n", optopt);
usage(argv[0]);
return -1;
}
}
nsources = argc - optind - 1;
if (nsources < 1) {
usage(argv[0]); usage(argv[0]);
return -1; return -1;
} }
}
nsources=argc-optind-1; sources = malloc((nsources + 1) * sizeof(char *));
if(nsources < 1){ if (sources == NULL) {
usage(argv[0]); return -1;
return -1; }
}
sources=malloc((nsources + 1) * sizeof(char *)); for(i = 0; i < nsources; ++i) {
if(sources == NULL) sources[i] = argv[optind];
return -1; optind++;
for(i=0;i<nsources;++i){ }
sources[i] = argv[optind];
optind++; sources[i] = NULL;
} destination = argv[optind];
sources[i]=NULL; return 0;
destination=argv[optind];
return 0;
} }
static void location_free(struct location *loc) static void location_free(struct location *loc)
@ -108,35 +114,37 @@ static void location_free(struct location *loc)
} }
} }
static struct location *parse_location(char *loc){ static struct location *parse_location(char *loc) {
struct location *location; struct location *location;
char *ptr; char *ptr;
location = malloc(sizeof(struct location)); location = malloc(sizeof(struct location));
if (location == NULL) { if (location == NULL) {
return NULL; return NULL;
}
memset(location, 0, sizeof(struct location));
location->host=location->user=NULL;
ptr=strchr(loc,':');
if(ptr != NULL){
location->is_ssh=1;
location->path=strdup(ptr+1);
*ptr='\0';
ptr=strchr(loc,'@');
if(ptr != NULL){
location->host=strdup(ptr+1);
*ptr='\0';
location->user=strdup(loc);
} else {
location->host=strdup(loc);
} }
} else { memset(location, 0, sizeof(struct location));
location->is_ssh=0;
location->path=strdup(loc); location->host = location->user = NULL;
} ptr = strchr(loc, ':');
return location;
if (ptr != NULL) {
location->is_ssh = 1;
location->path = strdup(ptr+1);
*ptr = '\0';
ptr = strchr(loc, '@');
if (ptr != NULL) {
location->host = strdup(ptr+1);
*ptr = '\0';
location->user = strdup(loc);
} else {
location->host = strdup(loc);
}
} else {
location->is_ssh = 0;
location->path = strdup(loc);
}
return location;
} }
static void close_location(struct location *loc) { static void close_location(struct location *loc) {
@ -168,71 +176,79 @@ static void close_location(struct location *loc) {
} }
} }
static int open_location(struct location *loc, int flag){ static int open_location(struct location *loc, int flag) {
if(loc->is_ssh && flag==WRITE){ if (loc->is_ssh && flag == WRITE) {
loc->session=connect_ssh(loc->host,loc->user,verbosity); loc->session = connect_ssh(loc->host, loc->user, verbosity);
if(!loc->session){ if (!loc->session) {
fprintf(stderr,"Couldn't connect to %s\n",loc->host); fprintf(stderr, "Couldn't connect to %s\n", loc->host);
return -1; return -1;
}
loc->scp = ssh_scp_new(loc->session, SSH_SCP_WRITE, loc->path);
if (!loc->scp) {
fprintf(stderr, "error : %s\n", ssh_get_error(loc->session));
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
if (ssh_scp_init(loc->scp) == SSH_ERROR) {
fprintf(stderr, "error : %s\n", ssh_get_error(loc->session));
ssh_scp_free(loc->scp);
loc->scp = NULL;
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
return 0;
} else if (loc->is_ssh && flag == READ) {
loc->session = connect_ssh(loc->host, loc->user, verbosity);
if (!loc->session) {
fprintf(stderr, "Couldn't connect to %s\n", loc->host);
return -1;
}
loc->scp = ssh_scp_new(loc->session, SSH_SCP_READ, loc->path);
if (!loc->scp) {
fprintf(stderr, "error : %s\n", ssh_get_error(loc->session));
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
if (ssh_scp_init(loc->scp) == SSH_ERROR) {
fprintf(stderr, "error : %s\n", ssh_get_error(loc->session));
ssh_scp_free(loc->scp);
loc->scp = NULL;
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
return 0;
} else {
loc->file = fopen(loc->path, flag == READ ? "r":"w");
if (!loc->file) {
if (errno == EISDIR) {
if (chdir(loc->path)) {
fprintf(stderr,
"Error changing directory to %s: %s\n",
loc->path, strerror(errno));
return -1;
}
return 0;
}
fprintf(stderr,
"Error opening %s: %s\n",
loc->path, strerror(errno));
return -1;
}
return 0;
} }
loc->scp=ssh_scp_new(loc->session,SSH_SCP_WRITE,loc->path); return -1;
if(!loc->scp){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
if(ssh_scp_init(loc->scp)==SSH_ERROR){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
ssh_scp_free(loc->scp);
loc->scp = NULL;
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
return 0;
} else if(loc->is_ssh && flag==READ){
loc->session=connect_ssh(loc->host, loc->user,verbosity);
if(!loc->session){
fprintf(stderr,"Couldn't connect to %s\n",loc->host);
return -1;
}
loc->scp=ssh_scp_new(loc->session,SSH_SCP_READ,loc->path);
if(!loc->scp){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
if(ssh_scp_init(loc->scp)==SSH_ERROR){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
ssh_scp_free(loc->scp);
loc->scp = NULL;
ssh_disconnect(loc->session);
ssh_free(loc->session);
loc->session = NULL;
return -1;
}
return 0;
} else {
loc->file=fopen(loc->path,flag==READ ? "r":"w");
if(!loc->file){
if(errno==EISDIR){
if(chdir(loc->path)){
fprintf(stderr,"Error changing directory to %s: %s\n",loc->path,strerror(errno));
return -1;
}
return 0;
}
fprintf(stderr,"Error opening %s: %s\n",loc->path,strerror(errno));
return -1;
}
return 0;
}
return -1;
} }
/** @brief copies files from source location to destination /** @brief copies files from source location to destination
@ -240,158 +256,187 @@ static int open_location(struct location *loc, int flag){
* @param dest destination location * @param dest destination location
* @param recursive Copy also directories * @param recursive Copy also directories
*/ */
static int do_copy(struct location *src, struct location *dest, int recursive){ static int do_copy(struct location *src, struct location *dest, int recursive) {
int size; int size;
socket_t fd; socket_t fd;
struct stat s; struct stat s;
int w,r; int w, r;
char buffer[16384]; char buffer[16384];
int total=0; int total = 0;
int mode; int mode;
char *filename = NULL; char *filename = NULL;
/* recursive mode doesn't work yet */ /* recursive mode doesn't work yet */
(void)recursive; (void)recursive;
/* Get the file name and size*/ /* Get the file name and size*/
if(!src->is_ssh){ if (!src->is_ssh) {
fd = fileno(src->file); fd = fileno(src->file);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Invalid file pointer, error: %s\n", strerror(errno)); fprintf(stderr,
return -1; "Invalid file pointer, error: %s\n",
} strerror(errno));
r = fstat(fd, &s); return -1;
if (r < 0) { }
return -1; r = fstat(fd, &s);
} if (r < 0) {
size=s.st_size; return -1;
mode = s.st_mode & ~S_IFMT; }
filename=ssh_basename(src->path); size = s.st_size;
} else { mode = s.st_mode & ~S_IFMT;
size=0; filename = ssh_basename(src->path);
do { } else {
r=ssh_scp_pull_request(src->scp); size = 0;
if(r==SSH_SCP_REQUEST_NEWDIR){ do {
ssh_scp_deny_request(src->scp,"Not in recursive mode"); r = ssh_scp_pull_request(src->scp);
continue; if (r == SSH_SCP_REQUEST_NEWDIR) {
} ssh_scp_deny_request(src->scp, "Not in recursive mode");
if(r==SSH_SCP_REQUEST_NEWFILE){ continue;
size=ssh_scp_request_get_size(src->scp); }
filename=strdup(ssh_scp_request_get_filename(src->scp)); if (r == SSH_SCP_REQUEST_NEWFILE) {
mode=ssh_scp_request_get_permissions(src->scp); size = ssh_scp_request_get_size(src->scp);
//ssh_scp_accept_request(src->scp); filename = strdup(ssh_scp_request_get_filename(src->scp));
break; mode = ssh_scp_request_get_permissions(src->scp);
} //ssh_scp_accept_request(src->scp);
if(r==SSH_ERROR){ break;
fprintf(stderr,"Error: %s\n",ssh_get_error(src->session)); }
if (r == SSH_ERROR) {
fprintf(stderr,
"Error: %s\n",
ssh_get_error(src->session));
ssh_string_free_char(filename); ssh_string_free_char(filename);
return -1; return -1;
} }
} while(r != SSH_SCP_REQUEST_NEWFILE); } while(r != SSH_SCP_REQUEST_NEWFILE);
} }
if(dest->is_ssh){ if (dest->is_ssh) {
r=ssh_scp_push_file(dest->scp,src->path, size, mode); r = ssh_scp_push_file(dest->scp, src->path, size, mode);
// snprintf(buffer,sizeof(buffer),"C0644 %d %s\n",size,src->path); // snprintf(buffer, sizeof(buffer), "C0644 %d %s\n", size, src->path);
if(r==SSH_ERROR){ if (r == SSH_ERROR) {
fprintf(stderr,"error: %s\n",ssh_get_error(dest->session)); fprintf(stderr,
ssh_string_free_char(filename); "error: %s\n",
ssh_scp_free(dest->scp); ssh_get_error(dest->session));
dest->scp = NULL; ssh_string_free_char(filename);
return -1; ssh_scp_free(dest->scp);
} dest->scp = NULL;
} else { return -1;
if(!dest->file){ }
dest->file=fopen(filename,"w"); } else {
if(!dest->file){ if (!dest->file) {
fprintf(stderr,"Cannot open %s for writing: %s\n",filename,strerror(errno)); dest->file = fopen(filename, "w");
if(src->is_ssh) if (!dest->file) {
ssh_scp_deny_request(src->scp,"Cannot open local file"); fprintf(stderr,
ssh_string_free_char(filename); "Cannot open %s for writing: %s\n",
return -1; filename, strerror(errno));
} if (src->is_ssh) {
} ssh_scp_deny_request(src->scp, "Cannot open local file");
if(src->is_ssh){ }
ssh_scp_accept_request(src->scp); ssh_string_free_char(filename);
} return -1;
} }
do { }
if(src->is_ssh){ if (src->is_ssh) {
r=ssh_scp_read(src->scp,buffer,sizeof(buffer)); ssh_scp_accept_request(src->scp);
if(r==SSH_ERROR){ }
fprintf(stderr,"Error reading scp: %s\n",ssh_get_error(src->session)); }
ssh_string_free_char(filename);
return -1;
}
if(r==0)
break;
} else {
r=fread(buffer,1,sizeof(buffer),src->file);
if(r==0)
break;
if(r<0){
fprintf(stderr,"Error reading file: %s\n",strerror(errno));
ssh_string_free_char(filename);
return -1;
}
}
if(dest->is_ssh){
w=ssh_scp_write(dest->scp,buffer,r);
if(w == SSH_ERROR){
fprintf(stderr,"Error writing in scp: %s\n",ssh_get_error(dest->session));
ssh_scp_free(dest->scp);
dest->scp=NULL;
ssh_string_free_char(filename);
return -1;
}
} else {
w=fwrite(buffer,r,1,dest->file);
if(w<=0){
fprintf(stderr,"Error writing in local file: %s\n",strerror(errno));
ssh_string_free_char(filename);
return -1;
}
}
total+=r;
} while(total < size); do {
ssh_string_free_char(filename); if (src->is_ssh) {
printf("wrote %d bytes\n",total); r = ssh_scp_read(src->scp, buffer, sizeof(buffer));
return 0; if (r == SSH_ERROR) {
fprintf(stderr,
"Error reading scp: %s\n",
ssh_get_error(src->session));
ssh_string_free_char(filename);
return -1;
}
if (r == 0) {
break;
}
} else {
r = fread(buffer, 1, sizeof(buffer), src->file);
if (r == 0) {
break;
}
if (r < 0) {
fprintf(stderr,
"Error reading file: %s\n",
strerror(errno));
ssh_string_free_char(filename);
return -1;
}
}
if (dest->is_ssh) {
w = ssh_scp_write(dest->scp, buffer, r);
if (w == SSH_ERROR) {
fprintf(stderr,
"Error writing in scp: %s\n",
ssh_get_error(dest->session));
ssh_scp_free(dest->scp);
dest->scp = NULL;
ssh_string_free_char(filename);
return -1;
}
} else {
w = fwrite(buffer, r, 1, dest->file);
if (w <= 0) {
fprintf(stderr,
"Error writing in local file: %s\n",
strerror(errno));
ssh_string_free_char(filename);
return -1;
}
}
total += r;
} while(total < size);
ssh_string_free_char(filename);
printf("wrote %d bytes\n", total);
return 0;
} }
int main(int argc, char **argv){ int main(int argc, char **argv) {
struct location *dest, *src; struct location *dest, *src;
int i; int i;
int r; int r;
if(opts(argc,argv)<0) { if (opts(argc, argv) < 0) {
r = EXIT_FAILURE; r = EXIT_FAILURE;
goto end; goto end;
}
dest=parse_location(destination);
if(open_location(dest,WRITE)<0) {
location_free(dest);
r = EXIT_FAILURE;
goto end;
}
for(i=0;i<nsources;++i){
src=parse_location(sources[i]);
if(open_location(src,READ)<0){
location_free(src);
r = EXIT_FAILURE;
goto close_dest;
} }
if(do_copy(src,dest,0) < 0){
dest = parse_location(destination);
if (open_location(dest, WRITE) < 0) {
location_free(dest);
r = EXIT_FAILURE;
goto end;
}
for (i = 0; i < nsources; ++i) {
src = parse_location(sources[i]);
if (open_location(src, READ) < 0) {
location_free(src);
r = EXIT_FAILURE;
goto close_dest;
}
if (do_copy(src, dest, 0) < 0) {
close_location(src);
location_free(src);
break;
}
close_location(src); close_location(src);
location_free(src); location_free(src);
break;
} }
close_location(src);
location_free(src); r = 0;
}
r = 0;
close_dest: close_dest:
close_location(dest); close_location(dest);
location_free(dest); location_free(dest);
end: end:
return r; return r;
} }