mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
Fix some build errors. It still fails to build:
cc -fstack-protector -Qunused-arguments -w -DREADLINE -c glob.c glob.c:220:16: error: incomplete definition of type 'struct _dirdesc' if (fstat(dirp->dd_fd, &stb) < 0) ~~~~^ /usr/include/dirent.h:58:8: note: forward declaration of 'struct _dirdesc' struct _dirdesc; ^ 1 error generated.
This commit is contained in:
parent
2bff30e0da
commit
43b9214235
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=364237
24
ftp/ncftp1/files/patch-cmds.c
Normal file
24
ftp/ncftp1/files/patch-cmds.c
Normal file
@ -0,0 +1,24 @@
|
||||
--- cmds.c.orig 2014-08-06 20:08:22.000000000 -0400
|
||||
+++ cmds.c 2014-08-06 20:09:04.000000000 -0400
|
||||
@@ -90,7 +90,7 @@
|
||||
extern struct servent serv;
|
||||
extern struct cmd cmdtab[];
|
||||
extern struct userinfo uinfo;
|
||||
-extern FILE *cin, *cout, *logf;
|
||||
+extern FILE *cin, *cout, *logfile;
|
||||
extern int Optind;
|
||||
extern char *Optarg;
|
||||
extern int Optind;
|
||||
@@ -1352,9 +1352,9 @@
|
||||
if (connected)
|
||||
(void) disconnect(0, NULL);
|
||||
rcode = WriteRecentSitesFile();
|
||||
- if (logf != NULL) {
|
||||
- (void) fclose(logf);
|
||||
- logf = NULL;
|
||||
+ if (logfile != NULL) {
|
||||
+ (void) fclose(logfile);
|
||||
+ logfile = NULL;
|
||||
}
|
||||
return rcode;
|
||||
} /* close_up_shop */
|
34
ftp/ncftp1/files/patch-ftp.c
Normal file
34
ftp/ncftp1/files/patch-ftp.c
Normal file
@ -0,0 +1,34 @@
|
||||
--- ftp.c.orig 2014-08-06 20:08:32.000000000 -0400
|
||||
+++ ftp.c 2014-08-06 20:09:24.000000000 -0400
|
||||
@@ -89,7 +89,7 @@
|
||||
*/
|
||||
|
||||
/* ftp.c externs */
|
||||
-extern FILE *logf;
|
||||
+extern FILE *logfile;
|
||||
extern string anon_password;
|
||||
extern longstring cwd, lcwd;
|
||||
extern Hostname hostname;
|
||||
@@ -365,9 +365,9 @@
|
||||
#endif
|
||||
|
||||
/* Save which sites we opened to the user's logfile. */
|
||||
- if (logf != NULL) {
|
||||
+ if (logfile != NULL) {
|
||||
(void) time(&now);
|
||||
- (void) fprintf(logf, "%s opened at %s",
|
||||
+ (void) fprintf(logfile, "%s opened at %s",
|
||||
hostname,
|
||||
ctime(&now));
|
||||
}
|
||||
@@ -887,8 +887,8 @@
|
||||
} else
|
||||
(void) Strncpy(fullRemote, remote);
|
||||
|
||||
- if (logf != NULL) {
|
||||
- (void) fprintf(logf, "\t-> \"%s\" %s, %s\n",
|
||||
+ if (logfile != NULL) {
|
||||
+ (void) fprintf(logfile, "\t-> \"%s\" %s, %s\n",
|
||||
fullRemote, direction, bsstr);
|
||||
}
|
||||
#ifdef SYSLOG
|
@ -1,5 +1,14 @@
|
||||
--- main.c.orig Sun Oct 29 19:17:55 1995
|
||||
+++ main.c Tue Feb 18 19:11:56 1997
|
||||
--- main.c.orig 1995-10-29 22:17:55.000000000 -0500
|
||||
+++ main.c 2014-08-06 20:07:56.000000000 -0400
|
||||
@@ -69,7 +69,7 @@
|
||||
string pager; /* program to browse text files */
|
||||
string version = FTP_VERSION;
|
||||
long eventnumber; /* number of commands we've done */
|
||||
-FILE *logf = NULL; /* log user activity */
|
||||
+FILE *logfile = NULL; /* log user activity */
|
||||
longstring logfname; /* name of the logfile */
|
||||
long logsize = 4096L; /* max log size. 0 == no limit */
|
||||
int percent_flags; /* "%" in prompt string? */
|
||||
@@ -200,7 +200,7 @@
|
||||
ansi_escapes = 0;
|
||||
if ((cp = getenv("TERM")) != NULL) {
|
||||
@ -9,3 +18,12 @@
|
||||
ansi_escapes = 1;
|
||||
}
|
||||
#endif
|
||||
@@ -334,7 +334,7 @@
|
||||
cpend = 0; /* no pending replies */
|
||||
|
||||
if (*logfname)
|
||||
- logf = fopen (logfname, "a");
|
||||
+ logfile = fopen (logfname, "a");
|
||||
|
||||
|
||||
/* The user specified a host, maybe in 'colon-mode', on the command
|
||||
|
29
ftp/ncftp1/files/patch-set.c
Normal file
29
ftp/ncftp1/files/patch-set.c
Normal file
@ -0,0 +1,29 @@
|
||||
--- set.c.orig 2014-08-06 20:08:41.000000000 -0400
|
||||
+++ set.c 2014-08-06 20:09:47.000000000 -0400
|
||||
@@ -43,7 +43,7 @@
|
||||
extern string pager, anon_password, prompt;
|
||||
extern str32 curtypename;
|
||||
extern long logsize;
|
||||
-extern FILE *logf;
|
||||
+extern FILE *logfile;
|
||||
extern longstring rcname, logfname, lcwd;
|
||||
extern int auto_binary, ansi_escapes, debug;
|
||||
extern int mprompt, remote_is_unix, verbose;
|
||||
@@ -131,13 +131,13 @@
|
||||
|
||||
void set_log(char *fname, int unset)
|
||||
{
|
||||
- if (logf) {
|
||||
- (void) fclose(logf);
|
||||
- logf = NULL;
|
||||
+ if (logfile) {
|
||||
+ (void) fclose(logfile);
|
||||
+ logfile = NULL;
|
||||
}
|
||||
if (!unset && fname) {
|
||||
(void) Strncpy(logfname, fname);
|
||||
- logf = fopen (LocalDotPath(logfname), "a");
|
||||
+ logfile = fopen (LocalDotPath(logfname), "a");
|
||||
}
|
||||
} /* set_log */
|
||||
|
Loading…
Reference in New Issue
Block a user