From e7c6e7a7c181d8ee9d1a206d264a24b54b4911f4 Mon Sep 17 00:00:00 2001
From: Heng Li <lh3@live.co.uk>
Date: Tue, 30 Jun 2009 14:35:21 +0000
Subject: [PATCH] minor changes to knetfile: invalid fd equals -1 rather than 0

---
 knetfile.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/knetfile.c b/knetfile.c
index 8dd7e86..9029ee4 100644
--- a/knetfile.c
+++ b/knetfile.c
@@ -107,9 +107,9 @@ int kftp_connect(knetFile *ftp)
 
 int kftp_reconnect(knetFile *ftp)
 {
-	if (ftp->ctrl_fd) {
+	if (ftp->ctrl_fd >= 0) {
 		close(ftp->ctrl_fd);
-		ftp->ctrl_fd = 0;
+		ftp->ctrl_fd = -1;
 	}
 	close(ftp->fd);
 	return kftp_connect(ftp);
@@ -127,6 +127,7 @@ knetFile *kftp_parse_url(const char *fn, const char *mode)
 	l = p - fn - 6;
 	fp = calloc(1, sizeof(knetFile));
 	fp->type = KNF_TYPE_FTP;
+	fp->fd = -1;
 	fp->host = calloc(l + 1, 1);
 	if (strchr(mode, 'c')) fp->no_reconnect = 1;
 	strncpy(fp->host, fn + 6, l);
@@ -139,7 +140,7 @@ knetFile *kftp_parse_url(const char *fn, const char *mode)
 int kftp_connect_file(knetFile *fp)
 {
 	int ret;
-	if (fp->fd) {
+	if (fp->fd >= 0) {
 		close(fp->fd);
 		if (fp->no_reconnect) kftp_get_response(fp);
 	}
@@ -177,7 +178,7 @@ knetFile *knet_open(const char *fn, const char *mode)
 			return 0;
 		}
 		kftp_connect_file(fp);
-		if (fp->fd == -1) {
+		if (fp->fd < 0) {
 			knet_close(fp);
 			return 0;
 		}
@@ -251,8 +252,8 @@ int knet_seek(knetFile *fp, off_t off, int whence)
 int knet_close(knetFile *fp)
 {
 	if (fp == 0) return 0;
-	if (fp->ctrl_fd > 0) close(fp->ctrl_fd);
-	if (fp->fd > 0) close(fp->fd);
+	if (fp->ctrl_fd >= 0) close(fp->ctrl_fd);
+	if (fp->fd >= 0) close(fp->fd);
 	free(fp->response); free(fp->retr); free(fp->host);
 	free(fp);
 	return 0;
-- 
2.39.2