remove dependency on curl binary

fb-upload is now called fb-helper which supports downloading and uploading

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 0 insertions, 237 deletions

diff --git a/fb-upload.c.in b/fb-upload.c.in
deleted file mode 100644
index b0a44ee..0000000
--- a/fb-upload.c.in
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Description: This is intended as a helper script for fb only.
- *
- * Synopsis: ./fb-upload <pastebin URL> <file>
- *
- * Author: Florian "Bluewind" Pritz <flo@xssn.at>
- *
- * Licensed under GPLv3
- *   (see COPYING for full license text)
- */
-
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <libgen.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
-
-#define FORMAT_ARRAY_SIZE 5
-
-/* struct which holds the persistent data for progress_callback */
-struct progressData {
-	struct timeval starttime;
-	struct timeval last;
-	double ullast;
-	int lastStringLength;
-};
-
-/* load the contents of file fn into data */
-int load_file(const char *fn, char **data, size_t *data_size)
-{
-	FILE *fp;
-	size_t buf_size = 1024*1024; /* use 1MiB chunks */
-	int size = 0;
-
-	fp = fopen(fn, "rb");
-	if (fp == NULL) {
-		perror("load_file");
-		return 1;
-	}
-
-	/* read the file in buf_size chunks and appened the data to *data */
-	while (!feof(fp)) {
-		*data = realloc(*data, *data_size + buf_size);
-		if (*data == NULL) {
-			perror("load_file");
-			return 1;
-		}
-		size = fread(*data + *data_size, sizeof(char), buf_size, fp);
-		*data_size += size;
-	}
-
-	fclose(fp);
-
-	return 0;
-}
-
-void format_bytes(double bytes, char *buf)
-{
-	double base = 0;
-	int suffix_pos = 0;
-	char suffix[FORMAT_ARRAY_SIZE][4] = {"B", "KiB", "MiB", "GiB", "TiB"};
-
-	base = log(bytes) / log(1024);
-	suffix_pos = (int)floor(base);
-
-	if (suffix_pos >= FORMAT_ARRAY_SIZE)
-		suffix_pos = FORMAT_ARRAY_SIZE-1;
-
-	if (suffix_pos > 0) {
-		snprintf(buf, 64, "%.2f%s", pow(1024, base - suffix_pos), suffix[suffix_pos]);
-	} else {
-		snprintf(buf, 64, "%.2fB", bytes);
-	}
-}
-
-int progress_callback(void *cb_data,
-	double dltotal, double dlnow,
-	double ultotal, double ulnow)
-{
-	struct timeval now;
-	struct progressData *data = (struct progressData *)cb_data;
-	double timeSpent = 0;
-	int printed = 0;
-	char speed[64];
-	char total[64];
-
-	if (0 == ulnow)
-		return 0;
-
-	/* upload complete; clean up */
-	if (ulnow >= ultotal) {
-		fprintf(stderr, "%*s\r", data->lastStringLength + 1, "");
-		return 0;
-	}
-
-	gettimeofday(&now, NULL);
-
-	/* only refresh once a second */
-	if (data->last.tv_sec == now.tv_sec)
-		return 0;
-
-	/* calculate time between this and the last call in seconds */
-	timeSpent =
-		(double)(now.tv_sec - data->last.tv_sec) +
-		(double)(now.tv_usec - data->last.tv_usec) / 1000000.0;
-
-	format_bytes((ulnow - data->ullast) / timeSpent, (char *)&speed);
-	format_bytes(ulnow, (char *)&total);
-
-	/* print the progress */
-	printed = fprintf(stderr,
-		"\r%s/s uploaded: %.1f%% = %s",
-		speed, /* upload speed */
-		ulnow * 100.0 / ultotal, /* percent uploaded */
-		total); /* total data uploaded */
-
-	/* pad the string if the last one was longer to remove left over characters */
-	if (data->lastStringLength > printed)
-		fprintf(stderr, "%*s", data->lastStringLength - printed, "");
-
-	/* save current values for the next run */
-	data->ullast = ulnow;
-	data->last = now;
-	data->lastStringLength = printed;
-
-	return 0;
-}
-
-int main(int argc, char *argv[])
-{
-	CURL *curl;
-	CURLcode res;
-
-	char *userAgent = "fb-client/@VERSION@";
-
-	struct progressData cb_data = {
-		.starttime = {.tv_sec = 0, .tv_usec = 0},
-		.last = {.tv_sec = 0, .tv_usec = 0},
-		.ullast = 0.0,
-		.lastStringLength = 0
-	};
-	struct stat statbuf;
-
-	struct curl_httppost *formpost=NULL;
-	struct curl_httppost *lastptr=NULL;
-	struct curl_slist *headerlist=NULL;
-	static const char buf[] = "Expect:";
-	struct curl_forms forms[4];
-
-	char *data = NULL;
-	size_t data_size = 0;
-
-	int ret = 0;
-
-	/* simple arg check */
-	if(argc != 3)
-		return 1;
-
-	if (curl_global_init(CURL_GLOBAL_ALL) != 0) {
-		fprintf(stderr, "Error initializing curl");
-		return 10;
-	}
-
-	if(stat(argv[2], &statbuf) == -1) {
-		perror("fb-upload");
-		return 1;
-	}
-
-	/* load files with 0 size (/proc files for example) into memory so we can
-	 * determine their real length */
-	if (statbuf.st_size == 0) {
-		if (load_file(argv[2], &data, &data_size) != 0) {
-			return 1;
-		}
-		forms[0].option = CURLFORM_BUFFER;
-		forms[0].value = basename(argv[2]);
-		forms[1].option = CURLFORM_BUFFERPTR;
-		forms[1].value = data;
-		forms[2].option = CURLFORM_BUFFERLENGTH;
-		forms[2].value = (char *)data_size;
-		forms[3].option = CURLFORM_END;
-	} else {
-		forms[0].option = CURLFORM_FILE;
-		forms[0].value = argv[2];
-		forms[1].option = CURLFORM_END;
-	}
-
-	/* Fill in the file upload field */
-	curl_formadd(&formpost,
-		 &lastptr,
-		 CURLFORM_COPYNAME, "file",
-		 CURLFORM_ARRAY, forms,
-		 CURLFORM_END);
-
-	curl = curl_easy_init();
-	/* initialize custom header list (stating that Expect: 100-continue is not
-		 wanted */
-	headerlist = curl_slist_append(headerlist, buf);
-	if(curl) {
-		/* what URL that receives this POST */
-		curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
-		curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headerlist);
-		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
-		curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
-		curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, &cb_data);
-		curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
-		curl_easy_setopt(curl, CURLOPT_USERAGENT, userAgent);
-		curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
-		curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, (long)1);
-		curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, (long)30);
-		gettimeofday(&cb_data.starttime, NULL);
-		res = curl_easy_perform(curl);
-
-		if (res != 0) {
-			fprintf(stderr, "\n%s\n", curl_easy_strerror(res));
-			ret = 1;
-		}
-
-		/* cleanup */
-		curl_easy_cleanup(curl);
-		curl_formfree(formpost);
-		curl_slist_free_all (headerlist);
-		curl_global_cleanup();
-		free(data);
-	} else {
-		fprintf(stderr, "Error initializing curl");
-		ret = 1;
-	}
-	return ret;
-}