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

rename glob() function to bsdglob(). Function glob is part of newer linux libc

Browse Source
This commit is contained in:
Radim Kolar 2009-09-13 21:06:32 +02:00
parent 820e0a91af
commit 0a2c077877
15 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,9 @@ Version NEXT
command can handle server strings without \n for quite a long
time, so i decided to remove it. It is bad idea to terminate
version strings by \n while it is not required by FSP protocol.
glob() function used in FSP clients renamed to bsdglob because it
clashed with glob() functin in newer Linux glibc resulting in
segfaults.
Version 2.8.1b25 - 10 Sep 2009
GNU autotools build system was entirely replaced by SCons

2
bsd_src/glob.c
View File

@ -423,7 +423,7 @@ static void rscan (register char **t, charfunc f)
}
}
char **glob (register char * v)
char **bsdglob (register char * v)
{
char agpath[BUFSIZ];
char *agargv[GAVSIZ];

2
bsd_src/ls.c
View File

@ -223,7 +223,7 @@ static void doargs (int argc, char ** argv)
statworks = 0;
for (dircnt = regcnt = 0; *argv; ++argv) {
if(!(av = glob(*argv))) {
if(!(av = bsdglob(*argv))) {
av = av2;
av2[0] = *argv;
av2[1] = 0;

20
clients/SConscript
View File

@ -7,23 +7,23 @@ def createMergeSource(basename):
f.close()
if CLIENTS:
fcatcmd=env.Program(target = 'fcatcmd',source=['fcatcmd.c']+client+common)
fcdcmd=env.Program(target = 'fcdcmd', source=['fcdcmd.c','printpro.c']+client+common)
fducmd=env.Program(target = 'fducmd', source=['fducmd.c']+client+common)
fcatcmd=env.Program(target = 'fcatcmd',source=['fcatcmd.c']+client+common+bsdfsp)
fcdcmd=env.Program(target = 'fcdcmd', source=['fcdcmd.c','printpro.c']+client+common+bsdfsp)
fducmd=env.Program(target = 'fducmd', source=['fducmd.c']+client+common+bsdfsp)
ffindcmd=env.Program(target = 'ffindcmd',source=['ffindcmd.c']+client+common+bsdfsp)
fget=env.StaticObject('fgetcmd.c', CPPDEFINES='-DCOMMAND_GET')
fgetcmd=env.Program(target = 'fgetcmd',source=fget+client+common)
fgrabcmd=env.Program(target = 'fgrabcmd',source=['fgrabcmd.c']+client+common)
fgetcmd=env.Program(target = 'fgetcmd',source=fget+client+common+bsdfsp)
fgrabcmd=env.Program(target = 'fgrabcmd',source=['fgrabcmd.c']+client+common+bsdfsp)
fhostcmd=env.Program(target = 'fhostcmd',source=['fhostcmd.c','fhost.c','fspprof.l'])
flscmd=env.Program(target = 'flscmd',source=['flscmd.c']+client+common+bsdfsp)
fmkdircmd=env.Program(target = 'fmkdir',source=['fmkdir.c']+client+common)
fprocmd=env.Program(target = 'fprocmd',source=['fprocmd.c','printpro.c']+client+common)
fprocmd=env.Program(target = 'fprocmd',source=['fprocmd.c','printpro.c']+client+common+bsdfsp)
fputcmd=env.Program(target = 'fput',source=['fput.c']+client+common)
frmcmd=env.Program(target = 'frmcmd',source=['frmcmd.c']+client+common)
frmdircmd=env.Program(target = 'frmdircmd',source=['frmdircmd.c']+client+common)
frmcmd=env.Program(target = 'frmcmd',source=['frmcmd.c']+client+common+bsdfsp)
frmdircmd=env.Program(target = 'frmdircmd',source=['frmdircmd.c']+client+common+bsdfsp)
fvercmd=env.Program(target = 'fver',source=['fver.c']+client+common)
fstatcmd=env.Program(target = 'fstatcmd',source=['fstatcmd.c']+client+common)
fmvcmd=env.Program(target = 'fmvcmd',source=['fmvcmd.c']+client+common)
fstatcmd=env.Program(target = 'fstatcmd',source=['fstatcmd.c']+client+common+bsdfsp)
fmvcmd=env.Program(target = 'fmvcmd',source=['fmvcmd.c']+client+common+bsdfsp)
fbyecmd=env.Program(target = 'fbye',source=['fbye.c']+client+common)
fspsites=env.StaticObject('fspsites.l', LEXFLAGS='-Psite')
fsetupcmd=env.Program(target = 'fsetupcmd',source=['fsetupcmd.c',fspsites,'fhost.c']+client+common)

2
clients/fcatcmd.c
View File

@ -38,7 +38,7 @@ int main (int argc, char ** argv)
signal(SIGHUP,dont_die);
while(*++argv) {
av = glob(*argv);
av = bsdglob(*argv);
if(av)
while(*av)
{

2
clients/fcdcmd.c
View File

@ -49,7 +49,7 @@ int main (int argc, char ** argv)
f_cd(np);
puts(np);
} else {
if(!(av = glob(argv[1]))) {
if(!(av = bsdglob(argv[1]))) {
av = av2;
av2[0] = *argv;
av2[1] = 0;

2
clients/fducmd.c
View File

@ -95,7 +95,7 @@ int main (int argc, char ** argv)
}
for ( ; argv[optind]; optind++) {
if (!(files = glob(argv[optind]))) {
if (!(files = bsdglob(argv[optind]))) {
files = singlefile;
singlefile[0] = argv[optind];
singlefile[1] = 0;

2
clients/ffindcmd.c
View File

@ -100,7 +100,7 @@ int main (int argc, char ** argv)
/* Execute plan for all file lists */
while (*argv) {
if (argv >= p) break;
if (!(files = glob(*argv))) {
if (!(files = bsdglob(*argv))) {
files = singlefile;
singlefile[0] = *argv;
singlefile[1] = 0;

4
clients/fgetcmd.c
View File

@ -265,7 +265,7 @@ int main (int argc, char ** argv)
if(argc > optind) {
for( ; argc>optind ; optind++) {
if(!(av = glob(argv[optind]))) {
if(!(av = bsdglob(argv[optind]))) {
av = av2;
av2[0] = argv[optind];
av2[1] = 0;
@ -299,7 +299,7 @@ int main (int argc, char ** argv)
}
if(!getsl(n,1024)) break;
if(!*n) break;
if(!(av = glob(n))) {
if(!(av = bsdglob(n))) {
av = av2;
av2[0] = n;
av2[1] = 0;

2
clients/fmvcmd.c
View File

@ -80,7 +80,7 @@ int main (int argc, char ** argv)
{
for( optind=1; argc-1>optind ; optind++)
{
if(!(av = glob(argv[optind])))
if(!(av = bsdglob(argv[optind])))
{
av = av2;
av2[0] = argv[optind];

4
clients/fprocmd.c
View File

@ -69,7 +69,7 @@ int main (int argc, char ** argv)
{
key = *++argv;
while(*++argv) {
if(!(av = glob(*argv))) {
if(!(av = bsdglob(*argv))) {
av = av2;
av2[0] = *argv;
av2[1] = 0;
@ -81,7 +81,7 @@ int main (int argc, char ** argv)
} else {
/* get pro command */
if(argv[1]) while(*++argv) {
if(!(av = glob(*argv))) {
if(!(av = bsdglob(*argv))) {
av = av2;
av2[0] = *argv;
av2[1] = 0;

2
clients/frmcmd.c
View File

@ -42,7 +42,7 @@ int main (int argc, char ** argv)
env_client();
while(*++argv) {
if(!(av = glob(*argv))) {
if(!(av = bsdglob(*argv))) {
av = av2;
av2[0] = *argv;
av2[1] = 0;

2
clients/frmdircmd.c
View File

@ -43,7 +43,7 @@ int main (int argc, char **argv)
env_client();
while(*++argv) {
if(!(av = glob(*argv))) {
if(!(av = bsdglob(*argv))) {
av = av2;
av2[0] = *argv;
av2[1] = 0;

4
clients/fstatcmd.c
View File

@ -62,7 +62,7 @@ int main (int argc, char ** argv)
{
for( optind=1; argc>optind ; optind++)
{
if(!(av = glob(argv[optind])))
if(!(av = bsdglob(argv[optind])))
{
av = av2;
av2[0] = argv[optind];
@ -80,7 +80,7 @@ int main (int argc, char ** argv)
}
if(!getsl(n,1024)) break;
if(!*n) break;
if(!(av = glob(n))) {
if(!(av = bsdglob(n))) {
av = av2;
av2[0] = n;
av2[1] = 0;

2
include/bsd_extern.h
View File

@ -2,6 +2,6 @@
#define _FSP_BSD_EXTERN_H_ 1
/* glob.c */
char **glob (register char *);
char **bsdglob (register char *);
#endif /* _FSP_BSD_EXTERN_H_ */