Fix some bugs and typos.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1547 ec53bebd-3082-4978-b11e-865c3cabbd6b

appl/ftp/ftp/cmds.c

@@ -768,7 +768,8 @@ remglob(char **argv, int doswitch)
 		}
 	}
 	if (fgets(buf, sizeof (buf), ftemp) == NULL) {
-		fclose(ftemp), ftemp = NULL;
+		fclose(ftemp);
+		ftemp = NULL;
 		return (NULL);
 	}
 	if ((cp = strchr(buf, '\n')) != NULL)
@@ -1211,7 +1212,7 @@ shell(int argc, char **argv)
 		exit(1);
 	}
 	if (pid > 0)
-		while (wait(&status) != pid)
+		while (waitpid(-1, 0, &status) != pid)
 			;
 	signal(SIGINT, old1);
 	signal(SIGQUIT, old2);
@@ -1933,7 +1934,7 @@ restart(int argc, char **argv)
     if (argc != 2)
 	printf("restart: offset not specified\n");
     else {
-		off_t restart_point = atol(argv[1]);
+	restart_point = atol(argv[1]);
 	printf("restarting at %ld. %s\n", (long)restart_point,
 	       "execute get, put or append to initiate transfer");
     }

appl/ftp/ftp/ftp.c

@@ -57,8 +57,7 @@ hookup(char *host, int port)
     static char hostnamebuf[80];
 
     memset(&hisctladdr, 0, sizeof (hisctladdr));
-	hisctladdr.sin_addr.s_addr = inet_addr(host);
+    if(inet_aton(host, &hisctladdr.sin_addr)){
-	if (hisctladdr.sin_addr.s_addr != INADDR_NONE) {
 	hisctladdr.sin_family = AF_INET;
 	strncpy(hostnamebuf, host, sizeof(hostnamebuf));
     } else {
@@ -119,7 +118,7 @@ hookup(char *host, int port)
 	code = -1;
 	goto bad;
     }
-#if defined(IP_TOS) && defined(SETSOCKOPT)
+#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
     tos = IPTOS_LOWDELAY;
     if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
 	warn("setsockopt TOS (ignored)");
@@ -223,7 +222,7 @@ login(char *host)
     }
     if (n == CONTINUE) {
 	aflag++;
-		acct = malloc(128); /* XXX */
+	acct = tmp;
 	des_read_pw_string(acct, 128, "Account:", 0);
 	n = command("ACCT %s", acct);
     }
@@ -266,8 +265,6 @@ command(char *fmt, ...)
     sighand oldintr;
 
     abrtflag = 0;
-	if (debug)
-		printf("---> ");
     if (cout == NULL) {
 	warn("No control connection for command");
 	code = -1;
@@ -275,11 +272,14 @@ command(char *fmt, ...)
     }
     oldintr = signal(SIGINT, cmdabort);
     va_start(ap, fmt);
-	if(debug)
+    if(debug){
+	printf("---> ");
 	if (strncmp("PASS ", fmt, 5) == 0)
 	    printf("PASS XXXX");
 	else 
 	    vfprintf(stdout, fmt, ap);
+	va_start(ap, fmt);
+    }
     if(auth_complete)
 	krb4_write_enc(cout, fmt, ap);
     else
@@ -328,7 +328,8 @@ getreply(int expecteof)
 	    }
 	    lostpeer(0);
 	    if (verbose) {
-		printf("421 Service not available, remote server has closed connection\n");
+		printf("421 Service not available, "
+		       "remote server has closed connection\n");
 		fflush(stdout);
 	    }
 	    code = 421;
@@ -368,7 +369,7 @@ getreply(int expecteof)
 		    sigaction(SIGINT, &osa, NULL);
 		    if (code == 421)
 			lostpeer(0);
-#if 0
+#if 1
 		    if (abrtflag && 
 			osa.sa_handler != cmdabort && 
 			osa.sa_handler != SIG_IGN)
@@ -492,8 +493,6 @@ getreply(int expecteof)
 	    n = code / 100 + '0';
 	}
 
-		    
-
 	if (n != '1')
 	    cpend = 0;
 	signal(SIGINT,oldintr);
@@ -513,7 +512,7 @@ empty(fd_set *mask, int sec)
 
     t.tv_sec = (long) sec;
     t.tv_usec = 0;
-	return (select(32, mask, (fd_set *) 0, (fd_set *) 0, &t));
+    return (select(32, mask, NULL, NULL, &t));
 }
 
 jmp_buf	sendabort;

appl/ftp/ftp/main.c

@@ -114,19 +114,18 @@ main(int argc, char **argv)
 		exit(0);
 	    signal(SIGINT, intr);
 	    signal(SIGPIPE, lostpeer);
-		xargv[0] = argv[0]; /* or should this be "ftp"? */
+	    xargv[0] = (char*)__progname;
 	    xargv[1] = argv[0];
 	    xargv[2] = argv[1];
 	    xargv[3] = argv[2];
 	    xargv[4] = NULL;
 	    setpeer(argc+1, xargv);
 	}
-	if (setjmp(toplevel) == 0) {
+	top = setjmp(toplevel) == 0;
-	        top = 1;
+	if (top) {
 	    signal(SIGINT, intr);
 	    signal(SIGPIPE, lostpeer);
-	} else
+	}
-	        top = 0;
 	for (;;) {
 	    cmdscanner(top);
 	    top = 1;
@@ -140,18 +139,22 @@ intr(int sig)
 	longjmp(toplevel, 1);
 }
 
+#ifndef SHUT_RDWR
+#define SHUT_RDWR 2
+#endif
+
 RETSIGTYPE
 lostpeer(int sig)
 {
 
     if (connected) {
 	if (cout != NULL) {
-			shutdown(fileno(cout), 1+1);
+	    shutdown(fileno(cout), SHUT_RDWR);
 	    fclose(cout);
 	    cout = NULL;
 	}
 	if (data >= 0) {
-			shutdown(data, 1+1);
+	    shutdown(data, SHUT_RDWR);
 	    close(data);
 	    data = -1;
 	}
@@ -160,7 +163,7 @@ lostpeer(int sig)
     pswitch(1);
     if (connected) {
 	if (cout != NULL) {
-			shutdown(fileno(cout), 1+1);
+	    shutdown(fileno(cout), SHUT_RDWR);
 	    fclose(cout);
 	    cout = NULL;
 	}