aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2018-09-25 16:31:52 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-09-27 15:21:30 +0200
commit6118628424e805b349f18c6601808e8df00c216c (patch)
tree306e1627842d1ff256538290c4475fd90616efe5 /examples
parent00e5ef1b3c3895a60a48d735829879282b6b1f60 (diff)
downloadlibssh-6118628424e805b349f18c6601808e8df00c216c.tar.gz
libssh-6118628424e805b349f18c6601808e8df00c216c.tar.xz
libssh-6118628424e805b349f18c6601808e8df00c216c.zip
examples: Fix libssh_scp.c code style
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/libssh_scp.c597
1 files changed, 321 insertions, 276 deletions
diff --git a/examples/libssh_scp.c b/examples/libssh_scp.c
index 51413e9f..7a17e46c 100644
--- a/examples/libssh_scp.c
+++ b/examples/libssh_scp.c
@@ -25,62 +25,68 @@ program.
static char **sources;
static int nsources;
static char *destination;
-static int verbosity=0;
+static int verbosity = 0;
struct location {
- int is_ssh;
- char *user;
- char *host;
- char *path;
- ssh_session session;
- ssh_scp scp;
- FILE *file;
+ int is_ssh;
+ char *user;
+ char *host;
+ char *path;
+ ssh_session session;
+ ssh_scp scp;
+ FILE *file;
};
enum {
- READ,
- WRITE
+ READ,
+ WRITE
};
-static void usage(const char *argv0){
- fprintf(stderr,"Usage : %s [options] [[user@]host1:]file1 ... \n"
- " [[user@]host2:]destination\n"
- "sample scp client - libssh-%s\n",
-// "Options :\n",
-// " -r : use RSA to verify host public key\n",
- argv0,
- ssh_version(0));
- exit(0);
+static void usage(const char *argv0) {
+ fprintf(stderr, "Usage : %s [options] [[user@]host1:]file1 ... \n"
+ " [[user@]host2:]destination\n"
+ "sample scp client - libssh-%s\n",
+ // "Options :\n",
+ // " -r : use RSA to verify host public key\n",
+ argv0,
+ ssh_version(0));
+ exit(0);
}
-static int opts(int argc, char **argv){
- int i;
- while((i=getopt(argc,argv,"v"))!=-1){
- switch(i){
- case 'v':
- verbosity++;
- break;
- default:
- fprintf(stderr,"unknown option %c\n",optopt);
+static int opts(int argc, char **argv) {
+ int i;
+
+ while((i = getopt(argc, argv, "v")) != -1) {
+ switch(i) {
+ case 'v':
+ verbosity++;
+ break;
+ default:
+ fprintf(stderr, "unknown option %c\n", optopt);
+ usage(argv[0]);
+ return -1;
+ }
+ }
+
+ nsources = argc - optind - 1;
+ if (nsources < 1) {
usage(argv[0]);
return -1;
}
- }
- nsources=argc-optind-1;
- if(nsources < 1){
- usage(argv[0]);
- return -1;
- }
- sources=malloc((nsources + 1) * sizeof(char *));
- if(sources == NULL)
- return -1;
- for(i=0;i<nsources;++i){
- sources[i] = argv[optind];
- optind++;
- }
- sources[i]=NULL;
- destination=argv[optind];
- return 0;
+
+ sources = malloc((nsources + 1) * sizeof(char *));
+ if (sources == NULL) {
+ return -1;
+ }
+
+ for(i = 0; i < nsources; ++i) {
+ sources[i] = argv[optind];
+ optind++;
+ }
+
+ sources[i] = NULL;
+ destination = argv[optind];
+ return 0;
}
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){
- struct location *location;
- char *ptr;
-
- location = malloc(sizeof(struct location));
- if (location == 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);
+static struct location *parse_location(char *loc) {
+ struct location *location;
+ char *ptr;
+
+ location = malloc(sizeof(struct location));
+ if (location == 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 {
- location->host=strdup(loc);
+ location->is_ssh = 0;
+ location->path = strdup(loc);
}
- } else {
- location->is_ssh=0;
- location->path=strdup(loc);
- }
- return location;
+ return location;
}
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){
- if(loc->is_ssh && flag==WRITE){
- 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_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;
+static int open_location(struct location *loc, int flag) {
+ if (loc->is_ssh && flag == WRITE) {
+ 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_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;
}
- 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;
+ return -1;
}
/** @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 recursive Copy also directories
*/
-static int do_copy(struct location *src, struct location *dest, int recursive){
- int size;
- socket_t fd;
- struct stat s;
- int w,r;
- char buffer[16384];
- int total=0;
- int mode;
- char *filename = NULL;
- /* recursive mode doesn't work yet */
- (void)recursive;
- /* Get the file name and size*/
- if(!src->is_ssh){
- fd = fileno(src->file);
- if (fd < 0) {
- fprintf(stderr, "Invalid file pointer, error: %s\n", strerror(errno));
- return -1;
+static int do_copy(struct location *src, struct location *dest, int recursive) {
+ int size;
+ socket_t fd;
+ struct stat s;
+ int w, r;
+ char buffer[16384];
+ int total = 0;
+ int mode;
+ char *filename = NULL;
+ /* recursive mode doesn't work yet */
+ (void)recursive;
+ /* Get the file name and size*/
+ if (!src->is_ssh) {
+ fd = fileno(src->file);
+ if (fd < 0) {
+ fprintf(stderr,
+ "Invalid file pointer, error: %s\n",
+ strerror(errno));
+ return -1;
+ }
+ r = fstat(fd, &s);
+ if (r < 0) {
+ return -1;
+ }
+ size = s.st_size;
+ mode = s.st_mode & ~S_IFMT;
+ filename = ssh_basename(src->path);
+ } else {
+ size = 0;
+ do {
+ r = ssh_scp_pull_request(src->scp);
+ if (r == SSH_SCP_REQUEST_NEWDIR) {
+ ssh_scp_deny_request(src->scp, "Not in recursive mode");
+ continue;
+ }
+ if (r == SSH_SCP_REQUEST_NEWFILE) {
+ size = ssh_scp_request_get_size(src->scp);
+ filename = strdup(ssh_scp_request_get_filename(src->scp));
+ mode = ssh_scp_request_get_permissions(src->scp);
+ //ssh_scp_accept_request(src->scp);
+ break;
+ }
+ if (r == SSH_ERROR) {
+ fprintf(stderr,
+ "Error: %s\n",
+ ssh_get_error(src->session));
+ ssh_string_free_char(filename);
+ return -1;
+ }
+ } while(r != SSH_SCP_REQUEST_NEWFILE);
}
- r = fstat(fd, &s);
- if (r < 0) {
- return -1;
+
+ if (dest->is_ssh) {
+ r = ssh_scp_push_file(dest->scp, src->path, size, mode);
+ // snprintf(buffer, sizeof(buffer), "C0644 %d %s\n", size, src->path);
+ if (r == SSH_ERROR) {
+ fprintf(stderr,
+ "error: %s\n",
+ ssh_get_error(dest->session));
+ ssh_string_free_char(filename);
+ ssh_scp_free(dest->scp);
+ dest->scp = NULL;
+ return -1;
+ }
+ } else {
+ if (!dest->file) {
+ dest->file = fopen(filename, "w");
+ if (!dest->file) {
+ fprintf(stderr,
+ "Cannot open %s for writing: %s\n",
+ filename, strerror(errno));
+ if (src->is_ssh) {
+ ssh_scp_deny_request(src->scp, "Cannot open local file");
+ }
+ ssh_string_free_char(filename);
+ return -1;
+ }
+ }
+ if (src->is_ssh) {
+ ssh_scp_accept_request(src->scp);
+ }
}
- size=s.st_size;
- mode = s.st_mode & ~S_IFMT;
- filename=ssh_basename(src->path);
- } else {
- size=0;
+
do {
- r=ssh_scp_pull_request(src->scp);
- if(r==SSH_SCP_REQUEST_NEWDIR){
- ssh_scp_deny_request(src->scp,"Not in recursive mode");
- continue;
- }
- if(r==SSH_SCP_REQUEST_NEWFILE){
- size=ssh_scp_request_get_size(src->scp);
- filename=strdup(ssh_scp_request_get_filename(src->scp));
- mode=ssh_scp_request_get_permissions(src->scp);
- //ssh_scp_accept_request(src->scp);
- break;
- }
- if(r==SSH_ERROR){
- fprintf(stderr,"Error: %s\n",ssh_get_error(src->session));
+ if (src->is_ssh) {
+ r = ssh_scp_read(src->scp, buffer, sizeof(buffer));
+ 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;
- }
- } while(r != SSH_SCP_REQUEST_NEWFILE);
- }
-
- if(dest->is_ssh){
- r=ssh_scp_push_file(dest->scp,src->path, size, mode);
- // snprintf(buffer,sizeof(buffer),"C0644 %d %s\n",size,src->path);
- if(r==SSH_ERROR){
- fprintf(stderr,"error: %s\n",ssh_get_error(dest->session));
- ssh_string_free_char(filename);
- ssh_scp_free(dest->scp);
- dest->scp = NULL;
- return -1;
- }
- } else {
- if(!dest->file){
- dest->file=fopen(filename,"w");
- if(!dest->file){
- fprintf(stderr,"Cannot open %s for writing: %s\n",filename,strerror(errno));
- if(src->is_ssh)
- ssh_scp_deny_request(src->scp,"Cannot open local file");
- ssh_string_free_char(filename);
- return -1;
- }
- }
- if(src->is_ssh){
- ssh_scp_accept_request(src->scp);
- }
- }
- do {
- if(src->is_ssh){
- r=ssh_scp_read(src->scp,buffer,sizeof(buffer));
- 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;
+ 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){
- struct location *dest, *src;
- int i;
- int r;
- if(opts(argc,argv)<0) {
- r = EXIT_FAILURE;
- 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;
+int main(int argc, char **argv) {
+ struct location *dest, *src;
+ int i;
+ int r;
+ if (opts(argc, argv) < 0) {
+ r = EXIT_FAILURE;
+ goto end;
+ }
+
+ dest = parse_location(destination);
+ if (open_location(dest, WRITE) < 0) {
+ location_free(dest);
+ r = EXIT_FAILURE;
+ goto end;
}
- if(do_copy(src,dest,0) < 0){
+
+ 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);
location_free(src);
- break;
}
- close_location(src);
- location_free(src);
- }
- r = 0;
+
+ r = 0;
close_dest:
- close_location(dest);
- location_free(dest);
+ close_location(dest);
+ location_free(dest);
end:
- return r;
+ return r;
}