From dbe59dc02994a6f107374fe988a92b945d4fb566 Mon Sep 17 00:00:00 2001
From: yar <yar@FreeBSD.org>
Date: Mon, 5 Aug 2002 17:34:15 +0000
Subject: 1) Use "pathstring" instead of "STRING" consistently. 2) Remove
 unneeded "if not NULL" props from "pathstring",    which will never be NULL
 by the lexer design.

Inspired by:	OpenBSD
MFC after:	1 week
---
 libexec/ftpd/ftpcmd.y | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'libexec')

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index dbb6951..9266a2e 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -475,12 +475,11 @@ cmd
 			if ($2)
 				send_file_list(".");
 		}
-	| NLST check_login SP STRING CRLF
+	| NLST check_login SP pathstring CRLF
 		{
-			if ($2 && $4 != NULL)
+			if ($2)
 				send_file_list($4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| LIST check_login CRLF
 		{
@@ -489,10 +488,9 @@ cmd
 		}
 	| LIST check_login SP pathstring CRLF
 		{
-			if ($2 && $4 != NULL)
+			if ($2)
 				retrieve("/bin/ls -lgA %s", $4);
-			if ($4 != NULL)
-				free($4);
+			free($4);
 		}
 	| STAT check_login SP pathname CRLF
 		{
-- 
cgit v1.1