X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=local-pull.c;h=3a342ab18390d7ce0df1f970a4961b31548a9417;hb=d6db01075b65da2b8584a0450619390893aae103;hp=4f52bca48c390e8113b3695a53ce62e0c23278a8;hpb=d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f;p=git.git

diff --git a/local-pull.c b/local-pull.c
index 4f52bca4..3a342ab1 100644
--- a/local-pull.c
+++ b/local-pull.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include <limits.h>
 #include "cache.h"
 #include "commit.h"
 #include <errno.h>
@@ -14,15 +15,9 @@
 static int use_link = 0;
 static int use_symlink = 0;
 static int use_filecopy = 1;
-static int verbose = 0;
 
 static char *path;
 
-static void say(const char *fmt, const char *hex) {
-	if (verbose)
-		fprintf(stderr, fmt, hex);
-}
-
 int fetch(unsigned char *sha1)
 {
 	static int object_name_start = -1;
@@ -41,7 +36,7 @@ int fetch(unsigned char *sha1)
 	strcpy(filename + object_name_start + 3, hex + 2);
 	if (use_link) {
 		if (!link(filename, dest_filename)) {
-			say("link %s\n", hex);
+			pull_say("link %s\n", hex);
 			return 0;
 		}
 		/* If we got ENOENT there is no point continuing. */
@@ -51,7 +46,7 @@ int fetch(unsigned char *sha1)
 		}
 	}
 	if (use_symlink && !symlink(filename, dest_filename)) {
-		say("symlink %s\n", hex);
+		pull_say("symlink %s\n", hex);
 		return 0;
 	}
 	if (use_filecopy) {
@@ -76,10 +71,9 @@ int fetch(unsigned char *sha1)
 		munmap(map, st.st_size);
 		close(ofd);
 		if (status)
-			fprintf(stderr, "cannot write %s (%ld bytes)\n",
-				dest_filename, st.st_size);
+			fprintf(stderr, "cannot write %s\n", dest_filename);
 		else
-			say("copy %s\n", hex);
+			pull_say("copy %s\n", hex);
 		return status;
 	}
 	fprintf(stderr, "failed to copy %s with given copy methods.\n", hex);
@@ -117,7 +111,7 @@ int main(int argc, char **argv)
 		else if (argv[arg][1] == 'n')
 			use_filecopy = 0;
 		else if (argv[arg][1] == 'v')
-			verbose = 1;
+			get_verbosely = 1;
 		else
 			usage(local_pull_usage);
 		arg++;