From e0254f3936c9cadfe028c9d01ccb20bb7a7b035c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 14 Jul 2007 20:54:47 +0000 Subject: [PATCH] removed compiler warnings, narrowed some source lines, killed trailing whitespace --- example/simple/scp_write.c | 108 +++++++++++---------- example/simple/scp_write_nonblock.c | 140 ++++++++++++++-------------- example/simple/sftp_write.c | 117 ++++++++++++----------- example/simple/ssh2.c | 5 +- 4 files changed, 184 insertions(+), 186 deletions(-) diff --git a/example/simple/scp_write.c b/example/simple/scp_write.c index dd83e66..9ff41a9 100644 --- a/example/simple/scp_write.c +++ b/example/simple/scp_write.c @@ -1,5 +1,5 @@ /* - * $Id: scp_write.c,v 1.1 2007/06/06 12:34:08 jehousley Exp $ + * $Id: scp_write.c,v 1.2 2007/07/14 20:54:47 bagder Exp $ * * Sample showing how to do a simple SCP transfer. */ @@ -58,31 +58,31 @@ int main(int argc, char *argv[]) #endif if (argc > 1) { - hostaddr = inet_addr(argv[1]); + hostaddr = inet_addr(argv[1]); } else { - hostaddr = htonl(0x7F000001); + hostaddr = htonl(0x7F000001); } if (argc > 2) { - username = argv[2]; + username = argv[2]; } if (argc > 3) { - password = argv[3]; + password = argv[3]; } if(argc > 4) { - loclfile = argv[4]; + loclfile = argv[4]; } if (argc > 5) { - scppath = argv[5]; + scppath = argv[5]; } - + local = fopen(loclfile, "rb"); if (!local) { - fprintf(stderr, "Can't local file %s\n", loclfile); - goto shutdown; + fprintf(stderr, "Can't local file %s\n", loclfile); + goto shutdown; } - + stat(loclfile, &fileinfo); - + /* Ultra basic "connect to port 22 on localhost" * Your code is responsible for creating the socket establishing the * connection @@ -93,24 +93,24 @@ int main(int argc, char *argv[]) sin.sin_port = htons(22); sin.sin_addr.s_addr = hostaddr; if (connect(sock, (struct sockaddr*)(&sin), - sizeof(struct sockaddr_in)) != 0) { - fprintf(stderr, "failed to connect!\n"); - return -1; + sizeof(struct sockaddr_in)) != 0) { + fprintf(stderr, "failed to connect!\n"); + return -1; } /* Create a session instance */ session = libssh2_session_init(); if(!session) - return -1; + return -1; /* ... start it up. This will trade welcome banners, exchange keys, * and setup crypto, compression, and MAC layers */ rc = libssh2_session_startup(session, sock); if(rc) { - fprintf(stderr, "Failure establishing SSH session: %d\n", rc); - return -1; + fprintf(stderr, "Failure establishing SSH session: %d\n", rc); + return -1; } /* At this point we havn't yet authenticated. The first thing to do @@ -121,66 +121,62 @@ int main(int argc, char *argv[]) fingerprint = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5); fprintf(stderr, "Fingerprint: "); for(i = 0; i < 16; i++) { - fprintf(stderr, "%02X ", (unsigned char)fingerprint[i]); + fprintf(stderr, "%02X ", (unsigned char)fingerprint[i]); } fprintf(stderr, "\n"); if (auth_pw) { - /* We could authenticate via password */ - if (libssh2_userauth_password(session, username, password)) { - fprintf(stderr, "Authentication by password failed.\n"); - goto shutdown; - } + /* We could authenticate via password */ + if (libssh2_userauth_password(session, username, password)) { + fprintf(stderr, "Authentication by password failed.\n"); + goto shutdown; + } } else { - /* Or by public key */ - if (libssh2_userauth_publickey_fromfile(session, username, - "/home/username/.ssh/id_rsa.pub", - "/home/username/.ssh/id_rsa", - password)) { - fprintf(stderr, "\tAuthentication by public key failed\n"); - goto shutdown; - } + /* Or by public key */ + if (libssh2_userauth_publickey_fromfile(session, username, + "/home/username/.ssh/id_rsa.pub", + "/home/username/.ssh/id_rsa", + password)) { + fprintf(stderr, "\tAuthentication by public key failed\n"); + goto shutdown; + } } - //libssh2_trace(session, 0xFFFF); - /* Request a file via SCP */ - channel = libssh2_scp_send(session, scppath, 0x1FF & fileinfo.st_mode, (unsigned long)fileinfo.st_size); + channel = libssh2_scp_send(session, scppath, 0x1FF & fileinfo.st_mode, + (unsigned long)fileinfo.st_size); if (!channel) { - fprintf(stderr, "Unable to open a session\n"); - goto shutdown; + fprintf(stderr, "Unable to open a session\n"); + goto shutdown; } fprintf(stderr, "SCP session waiting to send file\n"); do { - nread = fread(mem, 1, sizeof(mem), local); - if (nread <= 0) { - /* end of file */ - break; - } - ptr = mem; - - do { - /* write data in a loop until we block */ - rc = libssh2_channel_write(channel, ptr, nread); - ptr += rc; - nread -= nread; - } while (rc > 0); + nread = fread(mem, 1, sizeof(mem), local); + if (nread <= 0) { + /* end of file */ + break; + } + ptr = mem; + + do { + /* write data in a loop until we block */ + rc = libssh2_channel_write(channel, ptr, nread); + ptr += rc; + nread -= nread; + } while (rc > 0); } while (1); fprintf(stderr, "Sending EOF\n"); libssh2_channel_send_eof(channel); - + fprintf(stderr, "Waiting for EOF\n"); libssh2_channel_wait_eof(channel); - + fprintf(stderr, "Waiting for channel to close\n"); libssh2_channel_wait_closed(channel); - -// fprintf(stderr, "Closing channel\n"); -// libssh2_channel_close(channel); - + libssh2_channel_free(channel); channel = NULL; diff --git a/example/simple/scp_write_nonblock.c b/example/simple/scp_write_nonblock.c index 4705edf..7827b7d 100644 --- a/example/simple/scp_write_nonblock.c +++ b/example/simple/scp_write_nonblock.c @@ -1,5 +1,5 @@ /* - * $Id: scp_write_nonblock.c,v 1.3 2007/07/05 11:08:17 jehousley Exp $ + * $Id: scp_write_nonblock.c,v 1.4 2007/07/14 20:54:47 bagder Exp $ * * Sample showing how to do a simple SCP transfer. */ @@ -58,31 +58,31 @@ int main(int argc, char *argv[]) #endif if (argc > 1) { - hostaddr = inet_addr(argv[1]); + hostaddr = inet_addr(argv[1]); } else { - hostaddr = htonl(0x7F000001); + hostaddr = htonl(0x7F000001); } if (argc > 2) { - username = argv[2]; + username = argv[2]; } if (argc > 3) { - password = argv[3]; + password = argv[3]; } if(argc > 4) { - loclfile = argv[4]; + loclfile = argv[4]; } if (argc > 5) { - scppath = argv[5]; + scppath = argv[5]; } - + local = fopen(loclfile, "rb"); if (!local) { - fprintf(stderr, "Can't local file %s\n", loclfile); - goto shutdown; + fprintf(stderr, "Can't local file %s\n", loclfile); + goto shutdown; } - + stat(loclfile, &fileinfo); - + /* Ultra basic "connect to port 22 on localhost" * Your code is responsible for creating the socket establishing the * connection @@ -93,13 +93,13 @@ int main(int argc, char *argv[]) sin.sin_port = htons(22); sin.sin_addr.s_addr = hostaddr; if (connect(sock, (struct sockaddr*)(&sin), - sizeof(struct sockaddr_in)) != 0) { - fprintf(stderr, "failed to connect!\n"); - return -1; + sizeof(struct sockaddr_in)) != 0) { + fprintf(stderr, "failed to connect!\n"); + return -1; } /* We set the socket non-blocking. We do it after the connect just to - simplify the example code. */ + simplify the example code. */ #ifdef F_SETFL /* FIXME: this can/should be done in a more portable manner */ rc = fcntl(sock, F_GETFL, 0); @@ -107,24 +107,24 @@ int main(int argc, char *argv[]) #else #error "add support for setting the socket non-blocking here" #endif - + /* Create a session instance */ session = libssh2_session_init(); if(!session) - return -1; + return -1; /* Since we have set non-blocking, tell libssh2 we are non-blocking */ libssh2_session_set_blocking(session, 0); - + /* ... start it up. This will trade welcome banners, exchange keys, * and setup crypto, compression, and MAC layers */ - while ((rc = libssh2_session_startup(session, sock)) - == LIBSSH2_ERROR_EAGAIN); + while ((rc = libssh2_session_startup(session, sock)) + == LIBSSH2_ERROR_EAGAIN); if(rc) { - fprintf(stderr, "Failure establishing SSH session: %d\n", rc); - return -1; + fprintf(stderr, "Failure establishing SSH session: %d\n", rc); + return -1; } /* At this point we havn't yet authenticated. The first thing to do @@ -135,82 +135,82 @@ int main(int argc, char *argv[]) fingerprint = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5); fprintf(stderr, "Fingerprint: "); for(i = 0; i < 16; i++) { - fprintf(stderr, "%02X ", (unsigned char)fingerprint[i]); + fprintf(stderr, "%02X ", (unsigned char)fingerprint[i]); } fprintf(stderr, "\n"); if (auth_pw) { - /* We could authenticate via password */ - while ((rc = libssh2_userauth_password(session, username, password)) == LIBSSH2_ERROR_EAGAIN); - if (rc) { - fprintf(stderr, "Authentication by password failed.\n"); - goto shutdown; - } + /* We could authenticate via password */ + while ((rc = libssh2_userauth_password(session, username, password)) == + LIBSSH2_ERROR_EAGAIN); + if (rc) { + fprintf(stderr, "Authentication by password failed.\n"); + goto shutdown; + } } else { - /* Or by public key */ - while ((rc = libssh2_userauth_publickey_fromfile(session, username, - "/home/username/.ssh/id_rsa.pub", - "/home/username/.ssh/id_rsa", - password)) == LIBSSH2_ERROR_EAGAIN); - if (rc) { - fprintf(stderr, "\tAuthentication by public key failed\n"); - goto shutdown; - } + /* Or by public key */ + while ((rc = libssh2_userauth_publickey_fromfile(session, username, + "/home/username/.ssh/id_rsa.pub", + "/home/username/.ssh/id_rsa", + password)) == LIBSSH2_ERROR_EAGAIN); + if (rc) { + fprintf(stderr, "\tAuthentication by public key failed\n"); + goto shutdown; + } } -// libssh2_trace(session, 0xFF7D); - /* Request a file via SCP */ do { - channel = libssh2_scp_send(session, scppath, 0x1FF & fileinfo.st_mode, (unsigned long)fileinfo.st_size); - - if ((!channel) && (libssh2_session_last_errno(session) != LIBSSH2_ERROR_EAGAIN)) { + channel = libssh2_scp_send(session, scppath, 0x1FF & fileinfo.st_mode, + (unsigned long)fileinfo.st_size); + + if ((!channel) && (libssh2_session_last_errno(session) != + LIBSSH2_ERROR_EAGAIN)) { char *err_msg; libssh2_session_last_error(session, &err_msg, NULL, 0); - fprintf(stderr, "%s\n", err_msg); - goto shutdown; - } + fprintf(stderr, "%s\n", err_msg); + goto shutdown; + } } while (!channel); fprintf(stderr, "SCP session waiting to send file\n"); do { - nread = fread(mem, 1, sizeof(mem), local); - if (nread <= 0) { - /* end of file */ - break; - } - ptr = mem; - - do { - /* write data in a loop until we block */ - while ((rc = libssh2_channel_write(channel, ptr, nread)) == LIBSSH2_ERROR_EAGAIN); - if (rc < 0) { - fprintf(stderr, "ERROR %d\n", rc); - } - ptr += rc; - nread -= rc; - } while (nread > 0); + nread = fread(mem, 1, sizeof(mem), local); + if (nread <= 0) { + /* end of file */ + break; + } + ptr = mem; + + do { + /* write data in a loop until we block */ + while ((rc = libssh2_channel_write(channel, ptr, nread)) == + LIBSSH2_ERROR_EAGAIN); + if (rc < 0) { + fprintf(stderr, "ERROR %d\n", rc); + } + ptr += rc; + nread -= rc; + } while (nread > 0); } while (1); fprintf(stderr, "Sending EOF\n"); while (libssh2_channel_send_eof(channel) == LIBSSH2_ERROR_EAGAIN); - + fprintf(stderr, "Waiting for EOF\n"); while (libssh2_channel_wait_eof(channel) == LIBSSH2_ERROR_EAGAIN); - + fprintf(stderr, "Waiting for channel to close\n"); while (libssh2_channel_wait_closed(channel) == LIBSSH2_ERROR_EAGAIN); - -// fprintf(stderr, "Closing channel\n"); -// while (libssh2_channel_close(channel) == LIBSSH2_ERROR_EAGAIN); - + libssh2_channel_free(channel); channel = NULL; shutdown: - while ((rc = libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing")) == LIBSSH2_ERROR_EAGAIN); + while ((rc = libssh2_session_disconnect(session, + "Normal Shutdown, Thank you for playing")) == LIBSSH2_ERROR_EAGAIN); libssh2_session_free(session); #ifdef WIN32 diff --git a/example/simple/sftp_write.c b/example/simple/sftp_write.c index 7a1c5df..e7d4281 100644 --- a/example/simple/sftp_write.c +++ b/example/simple/sftp_write.c @@ -1,5 +1,5 @@ /* - * $Id: sftp_write.c,v 1.4 2007/06/06 12:34:09 jehousley Exp $ + * $Id: sftp_write.c,v 1.5 2007/07/14 20:54:47 bagder Exp $ * * Sample showing how to do SFTP write transfers. * @@ -61,30 +61,30 @@ int main(int argc, char *argv[]) #endif if (argc > 1) { - hostaddr = inet_addr(argv[1]); + hostaddr = inet_addr(argv[1]); } else { - hostaddr = htonl(0x7F000001); + hostaddr = htonl(0x7F000001); } if(argc > 2) { - username = argv[2]; + username = argv[2]; } if(argc > 3) { - password = argv[3]; + password = argv[3]; } if(argc > 4) { - loclfile = argv[4]; + loclfile = argv[4]; } if(argc > 5) { - sftppath = argv[5]; + sftppath = argv[5]; } - + local = fopen(loclfile, "rb"); if (!local) { - printf("Can't local file %s\n", loclfile); - goto shutdown; + printf("Can't local file %s\n", loclfile); + goto shutdown; } - + /* * The application code is responsible for creating the socket * and establishing the connection @@ -94,28 +94,28 @@ int main(int argc, char *argv[]) sin.sin_family = AF_INET; sin.sin_port = htons(22); sin.sin_addr.s_addr = hostaddr; - if (connect(sock, (struct sockaddr*)(&sin), - sizeof(struct sockaddr_in)) != 0) { - fprintf(stderr, "failed to connect!\n"); - return -1; + if (connect(sock, (struct sockaddr*)(&sin), + sizeof(struct sockaddr_in)) != 0) { + fprintf(stderr, "failed to connect!\n"); + return -1; } /* Create a session instance */ session = libssh2_session_init(); if(!session) - return -1; + return -1; /* Since we have set non-blocking, tell libssh2 we are blocking */ libssh2_session_set_blocking(session, 1); - + /* ... start it up. This will trade welcome banners, exchange keys, * and setup crypto, compression, and MAC layers */ rc = libssh2_session_startup(session, sock); if(rc) { - fprintf(stderr, "Failure establishing SSH session: %d\n", rc); - return -1; + fprintf(stderr, "Failure establishing SSH session: %d\n", rc); + return -1; } /* At this point we havn't yet authenticated. The first thing to do @@ -126,67 +126,65 @@ int main(int argc, char *argv[]) fingerprint = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_MD5); printf("Fingerprint: "); for(i = 0; i < 16; i++) { - printf("%02X ", (unsigned char)fingerprint[i]); + printf("%02X ", (unsigned char)fingerprint[i]); } printf("\n"); if (auth_pw) { - /* We could authenticate via password */ - if (libssh2_userauth_password(session, username, password)) { - printf("Authentication by password failed.\n"); - goto shutdown; - } + /* We could authenticate via password */ + if (libssh2_userauth_password(session, username, password)) { + printf("Authentication by password failed.\n"); + goto shutdown; + } } else { - /* Or by public key */ - if (libssh2_userauth_publickey_fromfile(session, username, - "/home/username/.ssh/id_rsa.pub", - "/home/username/.ssh/id_rsa", - password)) { - printf("\tAuthentication by public key failed\n"); - goto shutdown; - } + /* Or by public key */ + if (libssh2_userauth_publickey_fromfile(session, username, + "/home/username/.ssh/id_rsa.pub", + "/home/username/.ssh/id_rsa", + password)) { + printf("\tAuthentication by public key failed\n"); + goto shutdown; + } } - //libssh2_trace(session, 0xFFFF); - fprintf(stderr, "libssh2_sftp_init()!\n"); sftp_session = libssh2_sftp_init(session); if (!sftp_session) { - fprintf(stderr, "Unable to init SFTP session\n"); - goto shutdown; + fprintf(stderr, "Unable to init SFTP session\n"); + goto shutdown; } /* Since we have not set non-blocking, tell libssh2 we are blocking */ libssh2_session_set_blocking(session, 1); - + fprintf(stderr, "libssh2_sftp_open()!\n"); /* Request a file via SFTP */ sftp_handle = - libssh2_sftp_open(sftp_session, sftppath, - LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, - LIBSSH2_SFTP_S_IRUSR|LIBSSH2_SFTP_S_IWUSR| - LIBSSH2_SFTP_S_IRGRP|LIBSSH2_SFTP_S_IROTH); - + libssh2_sftp_open(sftp_session, sftppath, + LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, + LIBSSH2_SFTP_S_IRUSR|LIBSSH2_SFTP_S_IWUSR| + LIBSSH2_SFTP_S_IRGRP|LIBSSH2_SFTP_S_IROTH); + if (!sftp_handle) { - fprintf(stderr, "Unable to open file with SFTP\n"); - goto shutdown; + fprintf(stderr, "Unable to open file with SFTP\n"); + goto shutdown; } fprintf(stderr, "libssh2_sftp_open() is done, now send data!\n"); do { - nread = fread(mem, 1, sizeof(mem), local); - if (nread <= 0) { - /* end of file */ - break; - } - ptr = mem; - - do { - /* write data in a loop until we block */ - rc = libssh2_sftp_write(sftp_handle, ptr, nread); - ptr += rc; - nread -= nread; - } while (rc > 0); + nread = fread(mem, 1, sizeof(mem), local); + if (nread <= 0) { + /* end of file */ + break; + } + ptr = mem; + + do { + /* write data in a loop until we block */ + rc = libssh2_sftp_write(sftp_handle, ptr, nread); + ptr += rc; + nread -= nread; + } while (rc > 0); } while (1); fclose(local); @@ -195,7 +193,8 @@ int main(int argc, char *argv[]) shutdown: - libssh2_session_disconnect(session, "Normal Shutdown, Thank you for playing"); + libssh2_session_disconnect(session, + "Normal Shutdown, Thank you for playing"); libssh2_session_free(session); #ifdef WIN32 diff --git a/example/simple/ssh2.c b/example/simple/ssh2.c index 5f2875e..706ba66 100644 --- a/example/simple/ssh2.c +++ b/example/simple/ssh2.c @@ -1,5 +1,5 @@ /* - * $Id: ssh2.c,v 1.3 2007/04/26 23:59:15 gknauf Exp $ + * $Id: ssh2.c,v 1.4 2007/07/14 20:54:47 bagder Exp $ * * Sample showing how to do SSH2 connect. * @@ -25,6 +25,9 @@ # ifdef HAVE_UNISTD_H #include #endif +# ifdef HAVE_ARPA_INET_H +#include +#endif #include #include