"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/ftp_var.h" between
tnftp-20151004.tar.gz and tnftp-20200705.tar.gz

About: tnftp is an enhanced ftp client (prior name "lukemftp").

ftp_var.h  (tnftp-20151004):ftp_var.h  (tnftp-20200705)
/* $NetBSD: ftp_var.h,v 1.12 2015/10/04 04:53:26 lukem Exp $ */ /* $NetBSD: ftp_var.h,v 1.13 2020/07/04 09:59:07 lukem Exp $ */
/* from NetBSD: ftp_var.h,v 1.83 2015/01/12 14:17:08 christos Exp * /* from NetBSD: ftp_var.h,v 1.85 2017/11/20 21:11:36 kre Exp */
/
/*- /*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc. * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to The NetBSD Foundation * This code is derived from software contributed to The NetBSD Foundation
* by Luke Mewburn. * by Luke Mewburn.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
skipping to change at line 275 skipping to change at line 275
GLOBAL char *cursor_pos; /* cursor position we're looking for */ GLOBAL char *cursor_pos; /* cursor position we're looking for */
GLOBAL size_t cursor_argc; /* location of cursor in margv */ GLOBAL size_t cursor_argc; /* location of cursor in margv */
GLOBAL size_t cursor_argo; /* offset of cursor in margv[cursor_argc] */ GLOBAL size_t cursor_argo; /* offset of cursor in margv[cursor_argc] */
#endif /* !NO_EDITCOMPLETE */ #endif /* !NO_EDITCOMPLETE */
GLOBAL char *hostname; /* name of host connected to */ GLOBAL char *hostname; /* name of host connected to */
GLOBAL int unix_server; /* server is unix, can use binary for ascii */ GLOBAL int unix_server; /* server is unix, can use binary for ascii */
GLOBAL int unix_proxy; /* proxy is unix, can use binary for ascii */ GLOBAL int unix_proxy; /* proxy is unix, can use binary for ascii */
GLOBAL char localcwd[MAXPATHLEN]; /* local dir */ GLOBAL char localcwd[MAXPATHLEN]; /* local dir */
GLOBAL char remotecwd[MAXPATHLEN]; /* remote dir */ GLOBAL char remotecwd[MAXPATHLEN]; /* remote dir */
GLOBAL int remcwdvalid; /* remotecwd has been updated */
GLOBAL char *username; /* name of user logged in as. (dynamic) */ GLOBAL char *username; /* name of user logged in as. (dynamic) */
GLOBAL sa_family_t family; /* address family to use for connections */ GLOBAL sa_family_t family; /* address family to use for connections */
GLOBAL const char *ftpport; /* port number to use for FTP connections */ GLOBAL const char *ftpport; /* port number to use for FTP connections */
GLOBAL const char *httpport; /* port number to use for HTTP connections */ GLOBAL const char *httpport; /* port number to use for HTTP connections */
#ifdef WITH_SSL #ifdef WITH_SSL
GLOBAL const char *httpsport; /* port number to use for HTTPS connections */ GLOBAL const char *httpsport; /* port number to use for HTTPS connections */
#endif #endif
GLOBAL const char *gateport; /* port number to use for gateftp connections */ GLOBAL const char *gateport; /* port number to use for gateftp connections */
GLOBAL struct addrinfo *bindai; /* local address to bind as */ GLOBAL struct addrinfo *bindai; /* local address to bind as */
skipping to change at line 342 skipping to change at line 343
# define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1 # define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
#endif #endif
#ifdef NO_LONG_LONG #ifdef NO_LONG_LONG
# define STRTOLL(x,y,z) strtol(x,y,z) # define STRTOLL(x,y,z) strtol(x,y,z)
#else #else
# define STRTOLL(x,y,z) strtoll(x,y,z) # define STRTOLL(x,y,z) strtoll(x,y,z)
#endif #endif
#ifdef NO_DEBUG #ifdef NO_DEBUG
#define DPRINTF(...) #define DPRINTF(...) (void)0
#define DWARN(...) #define DWARN(...) (void)0
#else #else
#define DPRINTF(...) if (ftp_debug) (void)fprintf(ttyout, __VA_ARGS__) #define DWFTP(a) do a; while (/*CONSTCOND*/0)
#define DWARN(...) if (ftp_debug) warn(__VA_ARGS__) #define DPRINTF(...) DWFTP(if (ftp_debug) (void)fprintf(ttyout, __VA_ARGS__))
#define DWARN(...) DWFTP(if (ftp_debug) warn(__VA_ARGS__))
#endif #endif
#define STRorNULL(s) ((s) ? (s) : "<null>") #define STRorNULL(s) ((s) ? (s) : "<null>")
#ifdef NO_USAGE #ifdef NO_USAGE
void xusage(void); void xusage(void);
#define UPRINTF(...) xusage() #define UPRINTF(...) xusage()
#else #else
#define UPRINTF(...) (void)fprintf(ttyout, __VA_ARGS__) #define UPRINTF(...) (void)fprintf(ttyout, __VA_ARGS__)
#endif #endif
 End of changes. 4 change blocks. 
7 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)