Module Name: othersrc Committed By: lukem Date: Sun Nov 15 10:08:25 UTC 2009
Update of /cvsroot/othersrc/usr.bin/tnftp/src In directory ivanova.netbsd.org:/tmp/cvs-serv26109 Log Message: Sync to 20090915: * rename getline() to get_line() to avoid libc conflict with latter * avoid NULL deref in error message Status: Vendor Tag: TNF Release Tags: NetBSD-20090915 U othersrc/usr.bin/tnftp/src/Makefile C othersrc/usr.bin/tnftp/src/cmds.c U othersrc/usr.bin/tnftp/src/cmdtab.c U othersrc/usr.bin/tnftp/src/complete.c U othersrc/usr.bin/tnftp/src/domacro.c C othersrc/usr.bin/tnftp/src/extern.h C othersrc/usr.bin/tnftp/src/fetch.c C othersrc/usr.bin/tnftp/src/ftp.1 U othersrc/usr.bin/tnftp/src/ftp.c U othersrc/usr.bin/tnftp/src/ftp_var.h C othersrc/usr.bin/tnftp/src/main.c U othersrc/usr.bin/tnftp/src/progressbar.c U othersrc/usr.bin/tnftp/src/progressbar.h U othersrc/usr.bin/tnftp/src/ruserpass.c C othersrc/usr.bin/tnftp/src/util.c C othersrc/usr.bin/tnftp/src/version.h 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF othersrc/usr.bin/tnftp/src