richard
/
shadowsocks-libev
mirror of https://github.com/shadowsocks/shadowsocks-libev.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix a typo

Max Lv 11 years ago
parent
3b98bcd0b2
commit
815c61f853
10 changed files with 46 additions and 35 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      libcork/Makefile
  2. 28
      libipset/Makefile
  3. 2
      libipset/Makefile.am
  4. 2
      libipset/Makefile.in
  5. 13
      src/local.c
  6. 2
      src/redir.c
  7. 2
      src/server.c
  8. 2
      src/tunnel.c
  9. 2
      src/utils.c
  10. 2
      src/utils.h

26
libcork/Makefile
View File

@ -201,14 +201,14 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing aclocal-1.14
ACLOCAL = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing aclocal-1.14
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
AR = ar
AUTOCONF = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing autoconf
AUTOHEADER = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing autoheader
AUTOMAKE = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing automake-1.14
AWK = gawk
AUTOCONF = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing autoconf
AUTOHEADER = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing autoheader
AUTOMAKE = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing automake-1.14
AWK = awk
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@ -228,12 +228,12 @@ EXEEXT =
FGREP = /usr/bin/grep -F
GREP = /usr/bin/grep
INET_NTOP_LIB =
INSTALL = /usr/bin/install -c
INSTALL = /usr/local/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /Library/Developer/CommandLineTools/usr/bin/ld
LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
LDFLAGS =
LIBOBJS =
LIBS = -lcrypto
@ -241,7 +241,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO = lipo
LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing makeinfo
MAKEINFO = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing makeinfo
MANIFEST_TOOL = :
MKDIR_P = /usr/local/bin/gmkdir -p
NM = /usr/bin/nm
@ -267,10 +267,10 @@ SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 1.4.5
abs_builddir = /Users/max/Develop/workspace/shadowsocks-libev/libcork
abs_srcdir = /Users/max/Develop/workspace/shadowsocks-libev/libcork
abs_top_builddir = /Users/max/Develop/workspace/shadowsocks-libev
abs_top_srcdir = /Users/max/Develop/workspace/shadowsocks-libev
abs_builddir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/libcork
abs_srcdir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/libcork
abs_top_builddir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev
abs_top_srcdir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_DUMPBIN =
@ -300,7 +300,7 @@ host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/install-sh
install_sh = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale

28
libipset/Makefile
View File

@ -197,14 +197,14 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing aclocal-1.14
ACLOCAL = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing aclocal-1.14
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
AR = ar
AUTOCONF = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing autoconf
AUTOHEADER = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing autoheader
AUTOMAKE = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing automake-1.14
AWK = gawk
AUTOCONF = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing autoconf
AUTOHEADER = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing autoheader
AUTOMAKE = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing automake-1.14
AWK = awk
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@ -224,12 +224,12 @@ EXEEXT =
FGREP = /usr/bin/grep -F
GREP = /usr/bin/grep
INET_NTOP_LIB =
INSTALL = /usr/bin/install -c
INSTALL = /usr/local/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /Library/Developer/CommandLineTools/usr/bin/ld
LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
LDFLAGS =
LIBOBJS =
LIBS = -lcrypto
@ -237,7 +237,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO = lipo
LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/missing makeinfo
MAKEINFO = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/missing makeinfo
MANIFEST_TOOL = :
MKDIR_P = /usr/local/bin/gmkdir -p
NM = /usr/bin/nm
@ -263,10 +263,10 @@ SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 1.4.5
abs_builddir = /Users/max/Develop/workspace/shadowsocks-libev/libipset
abs_srcdir = /Users/max/Develop/workspace/shadowsocks-libev/libipset
abs_top_builddir = /Users/max/Develop/workspace/shadowsocks-libev
abs_top_srcdir = /Users/max/Develop/workspace/shadowsocks-libev
abs_builddir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/libipset
abs_srcdir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/libipset
abs_top_builddir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev
abs_top_srcdir = /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev
ac_ct_AR = ar
ac_ct_CC = gcc
ac_ct_DUMPBIN =
@ -296,7 +296,7 @@ host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /Users/max/Develop/workspace/shadowsocks-libev/install-sh
install_sh = ${SHELL} /Volumes/DEVELOP/Develop/workspace/shadowsocks-libev/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@ -327,7 +327,7 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
set/iterator.c set/storage.c
libipset_la_SOURCES = general.c ${bdd_src} ${map_src} ${set_src}
libipset_la_CFLAGS = -Iinclude
libipset_la_CFLAGS = -Iinclude -I../libcork/include
libipset_la_LDFLAGS = -static
all: all-am

2
libipset/Makefile.am
View File

@ -26,6 +26,6 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
set/iterator.c set/storage.c
libipset_la_SOURCES = general.c ${bdd_src} ${map_src} ${set_src}
libipset_la_CFLAGS = -Iinclude
libipset_la_CFLAGS = -Iinclude -I../libcork/include
libipset_la_LDFLAGS = -static

2
libipset/Makefile.in
View File

@ -327,7 +327,7 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
set/iterator.c set/storage.c
libipset_la_SOURCES = general.c ${bdd_src} ${map_src} ${set_src}
libipset_la_CFLAGS = -Iinclude
libipset_la_CFLAGS = -Iinclude -I../libcork/include
libipset_la_LDFLAGS = -static
all: all-am

13
src/local.c
View File

@ -1066,7 +1066,18 @@ int main (int argc, char **argv)
if (pid_flags)
{
USE_SYSLOG(argv[0]);
demonize(pid_path);
#ifndef ANDROID
daemonize(pid_path);
#else
pid_t pid = getpid();
if (pid > 0)
{
FILE *file = fopen(pid_path, "w");
if (file == NULL) FATAL("Invalid pid file\n");
fprintf(file, "%d", pid);
fclose(file);
}
#endif
}
#ifdef __MINGW32__

2
src/redir.c
View File

@ -753,7 +753,7 @@ int main (int argc, char **argv)
if (pid_flags)
{
USE_SYSLOG(argv[0]);
demonize(pid_path);
daemonize(pid_path);
}
// ignore SIGPIPE

2
src/server.c
View File

@ -1040,7 +1040,7 @@ int main (int argc, char **argv)
if (pid_flags)
{
USE_SYSLOG(argv[0]);
demonize(pid_path);
daemonize(pid_path);
}
// ignore SIGPIPE

2
src/tunnel.c
View File

@ -784,7 +784,7 @@ int main (int argc, char **argv)
if (pid_flags)
{
USE_SYSLOG(argv[0]);
demonize(pid_path);
daemonize(pid_path);
}
// parse tunnel addr

2
src/utils.c
View File

@ -201,7 +201,7 @@ void usage()
printf("\n");
}
void demonize(const char* path)
void daemonize(const char* path)
{
#ifndef __MINGW32__
/* Our process ID and Session ID */

2
src/utils.h
View File

@ -100,7 +100,7 @@ char *itoa(int i);
int run_as(const char *user);
void FATAL(const char *msg);
void usage(void);
void demonize(const char* path);
void daemonize(const char* path);
char *ss_strndup(const char *s, size_t n);
#endif // _UTILS_H
Write Preview
Loading…
Cancel
Save