From 4d14c5c1e28b5f0f99eb31a28a01976da7787c30 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 12 Sep 2011 14:43:53 +0200
Subject: improve error handling

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 fb-helper.c.in |  5 +++--
 fb.in          | 34 ++++++++++++++++------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/fb-helper.c.in b/fb-helper.c.in
index bc5a1b7..d77b0b2 100644
--- a/fb-helper.c.in
+++ b/fb-helper.c.in
@@ -1,7 +1,7 @@
 /*
  * Description: This is intended as a helper script for fb only.
  *
- * Synopsis: ./fb-upload <action> <URL> <file>
+ * Synopsis: ./fb-helper <action> <URL> <file>
  *
  * action can be:
  * d = download <URL>
@@ -182,7 +182,8 @@ int main(int argc, char *argv[])
 
 	if (file) {
 		if(stat(file, &statbuf) == -1) {
-			perror("fb-upload");
+			fprintf(stderr, "fb-helper: %s: ", file);
+			perror(NULL);
 			return 1;
 		}
 
diff --git a/fb.in b/fb.in
index acb1756..0fa5994 100644
--- a/fb.in
+++ b/fb.in
@@ -40,7 +40,6 @@ do_upload() {
 
 	if [ ! -e "$file" ]; then
 		echo "Error: File \"$file\" doesn't exist" >&2
-		EXITCODE=1
 		return 1
 	fi
 
@@ -48,20 +47,20 @@ do_upload() {
 		cd "$basedirname"
 		if [ "$COMPRESS" = "1" ]; then
 			file="$TMPDIR/$basefilename.tar.gz"
-			tar -cf - -- "$basefilename" | gzip -c > "$file"
+			tar -cf - -- "$basefilename" | gzip -c > "$file" || return 1
 		elif [ "$COMPRESS" = "2" ]; then
 			file="$TMPDIR/$basefilename.tar.xz"
-			tar -cf - -- "$basefilename" | xz -c > "$file"
+			tar -cf - -- "$basefilename" | xz -c > "$file" || return 1
 		else
 			file="$TMPDIR/$basefilename.tar"
-			tar -cf "$file" -- "$basefilename"
+			tar -cf "$file" -- "$basefilename" || return 1
 		fi
 	else
 		if [ "$COMPRESS" = "1" ]; then
-			gzip -c -- "$file" > "$TMPDIR/$basefilename.gz"
+			gzip -c -- "$file" > "$TMPDIR/$basefilename.gz" || return 1
 			file="$TMPDIR/$basefilename.gz"
 		elif [ "$COMPRESS" = "2" ]; then
-			xz -c -- "$file" > "$TMPDIR/$basefilename.xz"
+			xz -c -- "$file" > "$TMPDIR/$basefilename.xz" || return 1
 			file="$TMPDIR/$basefilename.xz"
 		fi
 	fi
@@ -71,15 +70,12 @@ do_upload() {
 		WARNSIZE=`$LIBDIR/fb-helper d "$PASTEBIN/file/get_max_size"`
 		if [ `stat -c %s -- "$file"` -gt "$WARNSIZE" ]; then
 			echo "Warning: Your upload is too big and would be rejected. Maximum size is: $WARNSIZE bytes. Skipping..." >&2
-			EXITCODE=1
 			return 1
 		fi
 	fi
 
-	if ! $LIBDIR/fb-helper u "$PASTEBIN/file/do_upload" "$file" > $TMPFILE; then
-		EXITCODE=1
-		return 1
-	fi
+	$LIBDIR/fb-helper u "$PASTEBIN/file/do_upload" "$file" > $TMPFILE || return 1
+
 	sed '$d' $TMPFILE >&2
 	URL=`tail -1 $TMPFILE`"$EXTENSION"
 	echo $URL
@@ -158,9 +154,7 @@ if [ "$DELETE" ] || [ "$GET" ]; then
 	for i in "$@"; do
 		i=$(id_from_arg "$i")
 		if [ "$DELETE" ]; then
-			if ! $LIBDIR/fb-helper d "$PASTEBIN/file/delete/$i"; then
-				EXITCODE=1
-			fi
+			$LIBDIR/fb-helper d "$PASTEBIN/file/delete/$i" || EXITCODE=1
 
 		elif [ "$GET" ]; then
 			if [ "$COMPRESS" = "1" ]; then
@@ -181,7 +175,7 @@ elif [ $# -eq 0 ]; then
 		exit 1
 	fi
 	read_stdin "$TMPDIR/stdin"
-	do_upload "$TMPDIR/stdin"
+	do_upload "$TMPDIR/stdin" || EXITCODE=1
 else
 	if [ "$TAR" ]; then
 		if [ "$COMPRESS" = "1" ]; then
@@ -195,7 +189,7 @@ else
 			tar -cf "$file" -- "$@"
 		fi
 		COMPRESS=0
-		do_upload "$file"
+		do_upload "$file" || EXITCODE=1
 		break
 	else
 		for i in "$@"; do
@@ -206,10 +200,14 @@ else
 					continue
 				fi
 				for f in *; do
-					do_upload "$f" && rm -f -- "$f"
+					if do_upload "$f"; then
+						rm -f -- "$f"
+					else
+						EXITCODE=1
+					fi
 				done
 			else
-				do_upload "$i"
+				do_upload "$i" || EXITCODE=1
 			fi
 		done
 	fi
-- 
cgit v1.2.3-24-g4f1b