From owner-svn-src-user@FreeBSD.ORG  Thu Jan 13 14:41:58 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D11CA1065672;
	Thu, 13 Jan 2011 14:41:58 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C03D08FC12;
	Thu, 13 Jan 2011 14:41:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0DEfwi8053729;
	Thu, 13 Jan 2011 14:41:58 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0DEfw2P053727;
	Thu, 13 Jan 2011 14:41:58 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101131441.p0DEfw2P053727@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Thu, 13 Jan 2011 14:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217352 - user/nwhitehorn/bsdinstall/distfetch
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jan 2011 14:41:58 -0000

Author: nwhitehorn
Date: Thu Jan 13 14:41:58 2011
New Revision: 217352
URL: http://svn.freebsd.org/changeset/base/217352

Log:
  Provide better error reporting in distfetch.

Modified:
  user/nwhitehorn/bsdinstall/distfetch/distfetch.c

Modified: user/nwhitehorn/bsdinstall/distfetch/distfetch.c
==============================================================================
--- user/nwhitehorn/bsdinstall/distfetch/distfetch.c	Thu Jan 13 14:22:27 2011	(r217351)
+++ user/nwhitehorn/bsdinstall/distfetch/distfetch.c	Thu Jan 13 14:41:58 2011	(r217352)
@@ -11,7 +11,7 @@ main(void)
 {
 	char *diststring = strdup(getenv("DISTRIBUTIONS"));
 	char **urls;
-	int i, retval, ndists = 0;
+	int i, nfetched, ndists = 0;
 	for (i = 0; diststring[i] != 0; i++)
 		if (isspace(diststring[i]) && !isspace(diststring[i+1]))
 			ndists++;
@@ -25,14 +25,14 @@ main(void)
 	}
 
 	chdir(getenv("BSDINSTALL_DISTDIR"));
-	retval = fetch_files(ndists, urls);
+	nfetched = fetch_files(ndists, urls);
 
 	free(diststring);
 	for (i = 0; i < ndists; i++) 
 		free(urls[i]);
 	free(urls);
 
-	return (retval);
+	return ((nfetched == ndists) ? 0 : 1);
 }
 
 static int
@@ -47,6 +47,7 @@ fetch_files(int nfiles, char **urls)
 	uint8_t block[4096];
 	size_t chunk, fsize;
 	int i, progress, last_progress;
+	int nsuccess = 0; /* Number of files successfully downloaded */
 
 	progress = 0;
 	
@@ -131,8 +132,6 @@ fetch_files(int nfiles, char **urls)
 				    __DECONST(char **, items));
 		}
 
-		items[i*2 + 1] = "Done";
-
 		if (ustat.size > 0 && fsize < (size_t)ustat.size) {
 			if (fetchLastErrCode == 0) 
 				snprintf(errormsg, sizeof(errormsg),
@@ -145,6 +144,9 @@ fetch_files(int nfiles, char **urls)
 			items[i*2 + 1] = "Failed";
 			dialog_msgbox("Fetch Error", errormsg, 0, 0,
 				    TRUE);
+		} else {
+			items[i*2 + 1] = "Done";
+			nsuccess++;
 		}
 
 		fclose(fetch_out);
@@ -153,5 +155,5 @@ fetch_files(int nfiles, char **urls)
 	end_dialog();
 
 	free(items);
-	return (0);
+	return (nsuccess);
 }