mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- Support stage

Browse Source 
- Silent warnings
This commit is contained in:
Kevin Lo 2013-10-30 05:45:42 +00:00
parent c0ec00a06c
commit 47d2fb89b9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=332071
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ftp/atftp/Makefile
View File

@ -16,11 +16,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.dfsg
USE_RC_SUBR= atftpd
GNU_CONFIGURE= yes
PLIST_FILES= bin/atftp \
sbin/atftpd
PLIST_FILES= bin/atftp sbin/atftpd man/man1/atftp.1.gz man/man8/atftpd.8.gz
MAN1= atftp.1
MAN8= atftpd.8
NO_STAGE= yes
.include <bsd.port.mk>

20
ftp/atftp/files/patch-tftp_def.c
View File

@ -1,8 +1,20 @@
--- tftp_def.c.orig 2010-10-11 11:20:48.000000000 +0800
+++ tftp_def.c 2010-10-11 11:20:40.000000000 +0800
@@ -140,11 +140,14 @@
--- tftp_def.c.orig 2004-02-13 11:16:09.000000000 +0800
+++ tftp_def.c 2013-10-30 13:34:05.000000000 +0800
@@ -88,7 +88,7 @@
res->tv_usec -= 1000000;
return -1;
}
- else if (res->tv_usec <= 0);
+ else
{
return -1;
}
@@ -138,13 +138,16 @@
/*
* This is a strncpy function that take care of string NULL termination
*/
inline char *Strncpy(char *to, const char *from, size_t size)
-inline char *Strncpy(char *to, const char *from, size_t size)
+char *Strncpy(char *to, const char *from, size_t size)
{
- to[size-1] = '\000';
- return strncpy(to, from, size - 1);

4
ftp/atftp/files/patch-tftp_def.h
View File

@ -1,5 +1,5 @@
--- tftp_def.h.orig 2004-02-13 11:16:09.000000000 +0800
+++ tftp_def.h 2012-11-21 13:21:56.000000000 +0800
+++ tftp_def.h 2013-10-30 13:23:22.000000000 +0800
@@ -19,6 +19,7 @@
#include <sys/time.h>
@ -13,7 +13,7 @@
int timeval_diff(struct timeval *res, struct timeval *t1, struct timeval *t0);
int print_eng(double value, char *string, int size, char *format);
-inline char *Strncpy(char *to, const char *from, size_t size);
+extern inline char *Strncpy(char *to, const char *from, size_t size);
+char *Strncpy(char *to, const char *from, size_t size);
int Gethostbyname(char *addr, struct hostent *host);
#endif

4
ftp/atftp/files/patch-tftpd.h
View File

@ -1,5 +1,5 @@
--- tftpd.h.orig 2004-02-27 10:05:26.000000000 +0800
+++ tftpd.h 2012-11-21 13:07:15.000000000 +0800
+++ tftpd.h 2013-10-30 13:25:35.000000000 +0800
@@ -71,6 +71,11 @@
struct client_info {
struct sockaddr_in client;
@ -17,7 +17,7 @@
* Defined in tftpd_list.c, operation on client structure list.
*/
-inline void tftpd_clientlist_ready(struct thread_data *thread);
+extern inline void tftpd_clientlist_ready(struct thread_data *thread);
+void tftpd_clientlist_ready(struct thread_data *thread);
void tftpd_clientlist_remove(struct thread_data *thread,
struct client_info *client);
void tftpd_clientlist_free(struct thread_data *thread);

13
ftp/atftp/files/patch-tftpd_list.c
View File

@ -1,5 +1,5 @@
--- tftpd_list.c.orig 2010-10-11 12:44:39.000000000 +0800
+++ tftpd_list.c 2010-10-11 12:44:34.000000000 +0800
--- tftpd_list.c.orig 2004-02-27 10:05:26.000000000 +0800
+++ tftpd_list.c 2013-10-30 13:25:57.000000000 +0800
@@ -137,23 +137,17 @@
struct thread_data *data,
struct client_info *client)
@ -40,3 +40,12 @@
{
*thread = current;
/* insert the new client at the end. If the client is already
@@ -202,7 +196,7 @@
return 0;
}
-inline void tftpd_clientlist_ready(struct thread_data *thread)
+void tftpd_clientlist_ready(struct thread_data *thread)
{
pthread_mutex_lock(&thread->client_mutex);
thread->client_ready = 1;