idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
hsn 2005-02-13 18:05:06 +00:00
parent 221ed276f8
commit b11eec92e7
57 changed files with 47 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -18,3 +18,5 @@ mkinstalldirs
ylwrap
*.gz
*.bz2
.sconsign
.sconf_temp

9
ChangeLog
View File

@ -1,7 +1,14 @@
Version NEXT
use getopt from stdio.h instead of getopt.h in fspscan.c
fspscan now compiles on AIX and other OS without glibc (hoaxter)
!! fixed fatal bug from b23. Server sends large packets to clients if
client request has not prefered reply size inside. This confuses
all old fsp clients.
common/strdup.c removed
bsd_src/function.c bcopy -> memmove
removed STDC_HEADER checks, drop support for pre-ANSI compilers
started work on alternate SCons based build system
Version 2.8.1b23 - 14 Jan 2005
use srandomdev for seeding of client seq. number generator
make dirlister smarter - save one RTT per each directory listings

3
Makefile.am
View File

@ -2,4 +2,5 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS=include bsd_src common client server clients man contrib doc tests
EXTRA_DIST=fspd.conf FILES INFO BETA.README \
MACHINES COPYRIGHT setup.sh setup.csh
MACHINES COPYRIGHT setup.sh setup.csh \
SConstruct SConscript

3
TODO
View File

@ -22,7 +22,6 @@ we should add real,portable error codes support to CC_ERR extended data area.
PORTING
Sven's Slowaris 8 compile problem
Fixed? Sven's AIX compile problem
still not builds on freebsd 4 and FreeBSD 5 - non intel platforms?
NEEDS IMPROVMENT:
@ -38,6 +37,8 @@ LOCKING
CLIENTS
:high:
bug in directory listing parsing code, fspclient has it also
pyfsp and fsplib seems to be ok.
some client commands should exit with nonzero rc on failure
:low:

1
bsd_src/.cvsignore
View File

@ -3,3 +3,4 @@
Makefile
Makefile.in
.deps
.sconsign

4
bsd_src/Makefile.am
View File

@ -3,4 +3,6 @@
noinst_LIBRARIES = libbsdfsp.a
libbsdfsp_a_SOURCES = cmp.c fnmatch.c glob.c operator.c print.c \
find.c function.c ls.c option.c util.c
find.c function.c ls.c option.c util.c
EXTRA_DIST= SConscript

2
bsd_src/find.c
View File

@ -41,9 +41,7 @@
#include <sys/errno.h>
#include <stdio.h>
#include "my-string.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include "find.h"
extern int isoutput;

4
bsd_src/function.c
View File

@ -42,9 +42,7 @@
#endif
#endif
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include "my-string.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -205,7 +203,7 @@ static void brace_subst (char * orig, char ** store, char * path, int len)
client_done();
exit(EX_OSERR);
}
bcopy(path, p, plen);
memmove(p,path,plen);
p += plen;
++orig;
} else

2
bsd_src/glob.c
View File

@ -32,9 +32,7 @@
#include <sys/syslimits.h>
#endif
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include "my-string.h"
#ifndef NCARGS

2
bsd_src/ls.c
View File

@ -31,9 +31,7 @@ char copyright[] =
#include "client_def.h"
#include "c_extern.h"
#include <sys/ioctl.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
bsd_src/operator.c
View File

@ -38,9 +38,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include "find.h"
/*

2
bsd_src/option.c
View File

@ -38,9 +38,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
bsd_src/util.c
View File

@ -23,9 +23,7 @@
#include "tweak.h"
#include "common_def.h"
#include <ctype.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

1
client/.cvsignore
View File

@ -3,3 +3,4 @@ Makefile.in
*.o
*.a
.deps
.sconsign

2
client/lib.c
View File

@ -12,9 +12,7 @@
#include "client_def.h"
#include "c_extern.h"
#include "co_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
client/lock.c
View File

@ -8,9 +8,7 @@
\*********************************************************************/
#include "tweak.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include <time.h>
#include "client_def.h"
#include "c_extern.h"

2
client/util.c
View File

@ -10,9 +10,7 @@
#include "tweak.h"
#include "client_def.h"
#include "c_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include "my-string.h"
static int env_dir_malloced = 0;

1
clients/.cvsignore
View File

@ -18,6 +18,7 @@ fspmerge
fstatcmd
fver
.deps
.sconsign
fspprof.c
fspsites.c
fmvcmd

2
clients/fbye.c
View File

@ -12,9 +12,7 @@
#include "c_extern.h"
#include "merge.h"
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fcatcmd.c
View File

@ -13,9 +13,7 @@
#include "c_extern.h"
#include "bsd_extern.h"
#include "merge.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fcdcmd.c
View File

@ -8,9 +8,7 @@
\*********************************************************************/
#include "tweak.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fducmd.c
View File

@ -16,9 +16,7 @@
#include "bsd_extern.h"
#include "my-string.h"
#include "merge.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/ffindcmd.c
View File

@ -50,9 +50,7 @@
#include <sys/types.h>
#include <time.h>
#include <fcntl.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fgetcmd.c
View File

@ -14,9 +14,7 @@
#include "bsd_extern.h"
#include "co_extern.h"
#include <signal.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fhost.c
View File

@ -17,9 +17,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HOST_LOOKUP
#include <netdb.h>
#endif

2
clients/fhostcmd.c
View File

@ -19,9 +19,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include <ctype.h>
#ifdef HOST_LOOKUP

2
clients/flscmd.c
View File

@ -13,9 +13,7 @@
#include "bsd_extern.h"
#include "ls.h"
#include "merge.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fmkdir.c
View File

@ -10,9 +10,7 @@
#include "tweak.h"
#include "client_def.h"
#include "c_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fmvcmd.c
View File

@ -13,9 +13,7 @@
#include "c_extern.h"
#include "bsd_extern.h"
#include "co_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fprocmd.c
View File

@ -13,9 +13,7 @@
#include "bsd_extern.h"
#include "my-string.h"
#include "merge.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fput.c
View File

@ -11,9 +11,7 @@
#include "client_def.h"
#include "c_extern.h"
#include "co_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/frmcmd.c
View File

@ -11,9 +11,7 @@
#include "client_def.h"
#include "c_extern.h"
#include "bsd_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/frmdircmd.c
View File

@ -11,9 +11,7 @@
#include "client_def.h"
#include "c_extern.h"
#include "bsd_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fsetupcmd.c
View File

@ -19,9 +19,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include <ctype.h>
#define FSP_STAT stat

2
clients/fstatcmd.c
View File

@ -14,9 +14,7 @@
#include "bsd_extern.h"
#include "co_extern.h"
#include "merge.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/fver.c
View File

@ -13,9 +13,7 @@
#include "c_extern.h"
#include "merge.h"
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/merge.c
View File

@ -9,9 +9,7 @@
#include "tweak.h"
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
clients/printpro.c
View File

@ -11,9 +11,7 @@
#include "client_def.h"
#include "c_extern.h"
#include "my-string.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

4
common/Makefile.am
View File

@ -1,4 +1,6 @@
## Process this file with automake to produce Makefile.in
noinst_LIBRARIES=libcommon.a
libcommon_a_SOURCES=random.c strdup.c udp_io.c getsl.c
libcommon_a_SOURCES=random.c udp_io.c getsl.c
EXTRA_DIST= SConscript

25
common/strdup.c
View File

@ -1,25 +0,0 @@
#include "tweak.h"
#ifndef HAVE_STRDUP
#include <stdio.h>
#include "my-string.h"
char *strdup PROTO1(char *, str)
{
char *nstr;
if (str == (char*)0) return str;
nstr = (char*)malloc((unsigned int)(strlen(str) + 1));
if (nstr == (char*)0) {
fprintf(stderr, "strdup(): not enough memory to duplicate `%s'\n", str);
exit(EX_OSERR);
}
strcpy(nstr, str);
return nstr;
}
#endif

2
common/udp_io.c
View File

@ -11,9 +11,7 @@
#include "common_def.h"
#include "co_extern.h"
#include "my-string.h"
#ifdef HAVE_STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

18
configure.ac
View File

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a working configure script.
dnl tested with autoconf 2.57
AC_INIT(fsp,2.8.1b23,hsn@netmag.cz)
AC_INIT(fsp,2.8.1b24,hsn@netmag.cz)
AC_CONFIG_SRCDIR(server/main.c)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@ -94,10 +94,11 @@ AC_CHECK_LIB(efence,EF_Abort)
fi
AC_HEADER_STDC
AC_CHECK_HEADERS(limits.h sys/syslimits.h errno.h)
AC_CHECK_HEADERS(string.h memory.h strings.h unistd.h sys/resource.h utime.h)
AC_CHECK_HEADERS(string.h strings.h unistd.h sys/resource.h utime.h)
AC_HEADER_DIRENT
AC_HEADER_TIME
AC_CHECK_SIZEOF(unsigned)
AC_CHECK_SIZEOF(penis)
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(char)
@ -123,7 +124,7 @@ AC_CHECK_TYPE(nlink_t, ,AC_DEFINE(nlink_t, int,[declare nlink_t as int if not fo
AC_CHECK_TYPE(rlim_t, ,AC_DEFINE(rlim_t, [unsigned int],[declare rlim_t as unsigned int if not found in <sys/resource.h>]),[#include <sys/resource.h>])
AC_TYPE_SIGNAL
AC_FUNC_CLOSEDIR_VOID
AC_CHECK_FUNCS(random srandomdev strdup bcopy flock lockf getrlimit fork setsid semop)
AC_CHECK_FUNCS(random srandomdev flock lockf getrlimit fork setsid semop)
AC_CHECK_TYPE(union semun, ,AC_DEFINE(_SEM_SEMUN_UNDEFINED,1,[Define if you do not have semun in sys/sem.h]),
[#include <sys/types.h>
#include <sys/ipc.h>
@ -182,16 +183,7 @@ AC_CHECK_MEMBER(struct dirent.d_fileno,AC_DEFINE(HAVE_D_FILENO,1,[define if you
,[#include <dirent.h>])
AC_HEADER_SYS_WAIT
AC_HEADER_STAT
AC_CHECK_HEADERS(tzfile.h sysexits.h)
AC_CACHE_CHECK(for string.h declaring some functions incorrectly,fsp_cv_header_string_bogus,[
AC_TRY_LINK([#include <sys/types.h>
#include <string.h>],,
fsp_cv_header_string_bogus="no",
fsp_cv_header_string_bogus="yes"
)
])
if test "x$fsp_cv_header_string_bogus" = "xyes"; then AC_DEFINE(STRING_H_BOGUS,1,[Define if your string library is broken])
fi
dnl AC_CHECK_HEADERS(sysexits.h)
AC_FUNC_VPRINTF
AC_CACHE_CHECK(for reliable signals ,fsp_cv_sys_reliable_signals,[
AC_TRY_RUN(

1
contrib/.cvsignore
View File

@ -5,3 +5,4 @@ Makefile.in
mklargefile
fspscan
.deps
.sconsign

2
contrib/Makefile.am
View File

@ -1,3 +1,3 @@
bin_PROGRAMS=fspscan
EXTRA_DIST=auto_del.csh rotate.py
EXTRA_DIST=auto_del.csh rotate.py SConscript
noinst_HEADERS=fspscan.h

1
doc/.cvsignore
View File

@ -1,3 +1,4 @@
Makefile
Makefile.in
fsp-faq.html
.sconsign

1
include/.cvsignore
View File

@ -3,3 +3,4 @@ Makefile.in
stamp-h1
config.h
config.h.in
.sconsign

5
include/co_extern.h
View File

@ -3,11 +3,6 @@
/* common routines for both server and clients */
#ifndef HAVE_STRDUP
/* strdup.c */
char *strdup (const char *);
#endif
#ifndef HAVE_RANDOM
/* random.c */
void srandom (unsigned int);

25
include/my-string.h
View File

@ -1,35 +1,10 @@
#ifndef _FSP_MY_STRING_H_
#define _FSP_MY_STRING_H_ 1
#if defined(STRING_H_BOGUS) && defined(STDC_HEADERS)
extern void bzero(char *, int);
extern void *memset(void *, int, size_t);
extern char *strcpy(char *, const char *);
extern char *strncpy(char *, const char *, size_t);
extern char *strcat(char *, const char *);
extern int strcmp(const char *, const char *);
extern int strncmp(const char *, const char *, size_t);
extern char *strchr(const char *, int);
extern char *strerror(int);
#else
#if STDC_HEADERS || HAVE_STRING_H
#include <string.h>
/* An ANSI string.h and pre-ANSI memory.h might conflict. */
#if !STDC_HEADERS && HAVE_MEMORY_H
#include <memory.h>
#endif /* not STDC_HEADERS and HAVE_MEMORY_H */
#endif
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#endif
#ifndef HAVE_BCOPY
#define bcopy(s, d, n) memcpy((d), (s), (n))
#endif
#endif /* _FSP_MY_STRING_H_ */

17
include/tweak.h
View File

@ -1,6 +1,10 @@
#ifndef _FSP_TWEAK_H_
#define _FSP_TWEAK_H_ 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <sysexits.h>
#ifndef HAVE_FSEEKO
/* fallback to old fseek if no fseeko is available */
@ -22,15 +26,6 @@
#endif
#define min(x,y) ((x) < (y) ? (x) : (y))
#if defined(HAVE_DIRENT_H)
#define HAVE_STRUCT_DIRENT 1
#else
#undef HAVE_STRUCT_DIRENT
#endif
#ifdef HAVE_TZFILE_H
#include <tzfile.h>
#endif
#ifndef SECSPERDAY
#define SECSPERDAY (long)60*60*24
#endif
@ -46,10 +41,6 @@
#endif
#endif
#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
#endif
#if !defined(BYTE)
#if SIZEOF_CHAR == 1
#define BYTE char

1
server/.cvsignore
View File

@ -3,3 +3,4 @@ Makefile.in
*.o
fspd
.deps
.sconsign

1
server/Makefile.am
View File

@ -8,3 +8,4 @@ fspd_CFLAGS=-DSYSCONFDIR="\"@sysconfdir@\"" $(AM_CFLAGS)
fspd_LDADD=-L../common -lcommon $(EX_LIBS)
noinst_HEADERS=fifocache.h pidfile.h
EXTRA_DIST=SConscript

2
server/conf.c
View File

@ -10,9 +10,7 @@
#include "tweak.h"
#include <stdio.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include <ctype.h>
#include "server_def.h"
#include "s_extern.h"

2
server/file.c
View File

@ -11,9 +11,7 @@
#include "tweak.h"
#include "server_def.h"
#include "s_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

2
server/host.c
View File

@ -12,9 +12,7 @@
#include "s_extern.h"
#include <ctype.h>
#include <netdb.h>
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#include "my-string.h"
/****************************************************************************

10
server/server.c
View File

@ -12,9 +12,7 @@
#include "server_def.h"
#include "s_extern.h"
#include "co_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@ -391,7 +389,13 @@ void serve_file (struct sockaddr_in * from, UBUF * ub, FILE * fp,
else
if(len <= 0)
len = UBUF_SPACE;
} else len = packetsize; /* use default if it doesn't exist */
} else
{
/* use default if it doesn't exist */
len = packetsize;
if( len > UBUF_SPACE )
len = UBUF_SPACE;
}
pos = BB_READ4(ub->bb_pos);

1
tests/.cvsignore
View File

@ -1,4 +1,5 @@
.deps
.sconsign
Makefile
Makefile.in
mklargefile

2
tests/parsecheck.c
View File

@ -1,9 +1,7 @@
#include "tweak.h"
#include "server_def.h"
#include "s_extern.h"
#ifdef STDC_HEADERS
#include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif