Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / netinstall / nio-ftp.cc

diff --git a/netinstall/nio-ftp.cc b/netinstall/nio-ftp.cc
index f30beb6..9aa41de 100644 (file)
--- a/netinstall/nio-ftp.cc
+++ b/netinstall/nio-ftp.cc
@@ -43,7 +43,7 @@ ftp_line (SimpleSocket *s)
     last_line = s->gets ();
     log (LOG_BABBLE, "ftp > %s", last_line);
   } while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' '));
-  return atoi (last_line ? last_line : "0");
+  return atoi (last_line ?: "0");
 }
 
 NetIO_FTP::NetIO_FTP (char *Purl)
@@ -73,7 +73,7 @@ NetIO_FTP::NetIO_FTP (char *Purl)
       code = ftp_line (c);
       if (code == 331)
        {
-         c->printf ("PASS cygwin-setup@\r\n");
+         c->printf ("PASS xemacs-setup@\r\n");
          code = ftp_line (c);
        }