From 2294f71cef43cd8d16ac3a513ef87ced2c81481e Mon Sep 17 00:00:00 2001 From: lukem Date: Thu, 10 May 2007 05:35:31 +0000 Subject: [PATCH] Use getline() instead of fparseln() --- usr.bin/ftp/cmds.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c index 554b17ade20e..a61f5106f5f1 100644 --- a/usr.bin/ftp/cmds.c +++ b/usr.bin/ftp/cmds.c @@ -1,4 +1,4 @@ -/* $NetBSD: cmds.c,v 1.121 2007/04/18 01:39:04 lukem Exp $ */ +/* $NetBSD: cmds.c,v 1.122 2007/05/10 05:35:31 lukem Exp $ */ /*- * Copyright (c) 1996-2007 The NetBSD Foundation, Inc. @@ -103,7 +103,7 @@ #if 0 static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94"; #else -__RCSID("$NetBSD: cmds.c,v 1.121 2007/04/18 01:39:04 lukem Exp $"); +__RCSID("$NetBSD: cmds.c,v 1.122 2007/05/10 05:35:31 lukem Exp $"); #endif #endif /* not lint */ @@ -754,8 +754,9 @@ mget(int argc, char *argv[]) void fget(int argc, char *argv[]) { - char *buf, *mode; + char *mode; FILE *fp; + char buf[MAXPATHLEN]; if (argc != 2) { UPRINTF("usage: %s localfile\n", argv[0]); @@ -773,9 +774,7 @@ fget(int argc, char *argv[]) argv[0] = "get"; mode = restart_point ? "r+" : "w"; - for (; - (buf = fparseln(fp, NULL, NULL, "\0\0\0", 0)) != NULL; - free(buf)) { + while (getline(fp, buf, sizeof(buf), NULL) >= 0) { if (buf[0] == '\0') continue; argv[1] = buf;