svragv/sakisafe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean code

Browse source
This commit is contained in:
(≧◡≦) 2022-07-09 16:40:25 +02:00
parent 957b87161c
commit 9c8749e664
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sakisafecli/Makefile
View file

@ -3,6 +3,8 @@ SRCS += funcs.c sakisafecli.c config.c
MAN = sakisafecli.1 sakisafeclirc.5 MAN = sakisafecli.1 sakisafeclirc.5
LDADD = -lssl -lz -lpthread -lnghttp2 -lcurl -lconfig -lcrypto -L/usr/local/lib LDADD = -lssl -lz -lpthread -lnghttp2 -lcurl -lconfig -lcrypto -L/usr/local/lib
PREFIX = /usr/local PREFIX = /usr/local
BINDIR = $(PREFIX)/bin BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/man/man MANDIR = $(PREFIX)/man/man
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
sakisafecli/funcs.c
View file

@ -19,7 +19,6 @@ print_usage()
return; return;
} }
void void
print_help() print_help()
{ {

2
sakisafecli/options.h
View file

@ -26,6 +26,6 @@ extern bool http_proxy_flag;
extern bool ipv6_flag; extern bool ipv6_flag;
extern bool ipv4_flag; extern bool ipv4_flag;
extern bool silent_flag; extern bool silent_flag;
extern config_t runtime_config;
extern char *ssh_key_path; extern char *ssh_key_path;
extern config_t runtime_config;
#endif /* OPTIONS_H */ #endif /* OPTIONS_H */

16
sakisafecli/sakisafecli.c
View file

@ -8,6 +8,7 @@
#include <unistd.h> #include <unistd.h>
#include <curl/curl.h> #include <curl/curl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#include "curl/easy.h" #include "curl/easy.h"
#include "options.h" #include "options.h"
@ -151,7 +152,9 @@ main(int argc, char **argv)
} }
if(access(argv[optind], F_OK) && !paste_flag) { if(access(argv[optind], F_OK) && !paste_flag) {
fprintf(stderr, "Error opening file\n"); fprintf(stderr, "Error opening file: %s\n",
strerror(errno)
);
return -1; return -1;
} }
@ -178,8 +181,7 @@ main(int argc, char **argv)
curl_easy_setopt(easy_handle, CURLOPT_PROXY, socks_proxy_url); curl_easy_setopt(easy_handle, CURLOPT_PROXY, socks_proxy_url);
curl_easy_setopt( curl_easy_setopt(
easy_handle, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME); easy_handle, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
} else if(http_proxy_flag && ((protocol == CURLPROTO_HTTP) || } else if(http_proxy_flag && protocol == CURLPROTO_HTTP) {
(protocol == CURLPROTO_HTTPS))) {
curl_easy_setopt(easy_handle, CURLOPT_PROXY, http_proxy_url); curl_easy_setopt(easy_handle, CURLOPT_PROXY, http_proxy_url);
curl_easy_setopt(easy_handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); curl_easy_setopt(easy_handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
} }
@ -209,9 +211,10 @@ main(int argc, char **argv)
/* Process HTTP uploads */ /* Process HTTP uploads */
if(protocol == CURLPROTO_HTTP || protocol == CURLPROTO_HTTPS) { if(protocol == CURLPROTO_HTTP) {
curl_mime *mime; curl_mime *mime;
mime = curl_mime_init(easy_handle); mime = curl_mime_init(easy_handle);
curl_easy_setopt(easy_handle, CURLOPT_MIMEPOST, mime); curl_easy_setopt(easy_handle, CURLOPT_MIMEPOST, mime);
if(!mime) { if(!mime) {
fprintf(stderr, "Error initializing curl_mime\n"); fprintf(stderr, "Error initializing curl_mime\n");
@ -240,16 +243,21 @@ main(int argc, char **argv)
else if(protocol == CURLPROTO_SCP) { else if(protocol == CURLPROTO_SCP) {
char path[256]; char path[256];
char *filename = argv[optind]; char *filename = argv[optind];
curl_easy_setopt(easy_handle, CURLOPT_UPLOAD, true); curl_easy_setopt(easy_handle, CURLOPT_UPLOAD, true);
FILE *fp = fopen(filename, "r"); FILE *fp = fopen(filename, "r");
struct stat st; struct stat st;
stat(argv[optind], &st); stat(argv[optind], &st);
snprintf(path, 256, "%s/%s", server, filename); snprintf(path, 256, "%s/%s", server, filename);
curl_easy_setopt(easy_handle, CURLOPT_READDATA, fp); curl_easy_setopt(easy_handle, CURLOPT_READDATA, fp);
curl_easy_setopt( curl_easy_setopt(
easy_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)st.st_size); easy_handle, CURLOPT_INFILESIZE_LARGE, (curl_off_t)st.st_size);
curl_easy_setopt(easy_handle, CURLOPT_URL, path); curl_easy_setopt(easy_handle, CURLOPT_URL, path);
curl_easy_perform(easy_handle); curl_easy_perform(easy_handle);
putchar('\n');
} else { } else {
puts("Unsupported protocol"); puts("Unsupported protocol");
return -1; return -1;