commit 76521d264f0abeb4a3bb6c8e55d50b1332f766dc
from: Omar Polo <op@omarpolo.com>
date: Sun Jan 16 11:07:16 2022 UTC

simplify fetch_fid: make it a single function again

commit - 2ba2571160ed1e4cc47874105f0ae52fb25310c1
commit + 76521d264f0abeb4a3bb6c8e55d50b1332f766dc
blob - 6c3add1f03762e1c3da3f09c66a6b5d2f0512ac4
blob + 3dcd0d0f68154efbef9420935efcd83bfc91320c
--- kamiftp/ftp.c
+++ kamiftp/ftp.c
@@ -586,7 +586,7 @@ draw_progress(const char *pre, const struct progress *
 }
 
 static void
-fetch_fid_in_fd(int fid, int fd, const char *name)
+fetch_fid(int fid, int fd, const char *name)
 {
 	struct progress p = {0};
 	struct np_stat st;
@@ -624,23 +624,8 @@ fetch_fid_in_fd(int fid, int fd, const char *name)
 	}
 
 	putchar('\n');
-}
-
-static int
-fetch_fid(int fid, const char *path)
-{
-	int fd;
 
-	fd = open(path, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
-	if (fd == -1) {
-		warn("can't open %s", path);
-		return -1;
-	}
-
-	fetch_fid_in_fd(fid, fd, path);
-	close(fd);
 	do_clunk(fid);
-	return 0;
 }
 
 static void
@@ -810,6 +795,7 @@ cmd_get(int argc, const char **argv)
 	struct qid qid;
 	const char *l;
 	int nfid;
+	int fd;
 
 	if (argc != 1 && argc != 2) {
 		printf("usage: get remote-file [local-file]\n");
@@ -835,7 +821,14 @@ cmd_get(int argc, const char **argv)
 		return;
 	}
 
-	fetch_fid(nfid, l);
+	if ((fd = open(l, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644)) == -1) {
+		warn("can't open %s", l);
+		do_clunk(nfid);
+		return;
+	}
+
+	fetch_fid(nfid, fd, l);
+	close(fd);
 }
 
 static void
@@ -958,7 +951,7 @@ cmd_page(int argc, const char **argv)
 
 	strlcpy(p, *argv, sizeof(p));
 	name = basename(p);
-	fetch_fid_in_fd(nfid, tmpfd, name);
+	fetch_fid(nfid, tmpfd, name);
 	close(tmpfd);
 	spawn("less", sfn, NULL);
 	unlink(sfn);