From 815c61f853625752dc299955178d8b639a448150 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 9 May 2014 19:40:29 +0800 Subject: [PATCH] fix a typo --- libcork/Makefile | 26 +++++++++++++------------- libipset/Makefile | 28 ++++++++++++++-------------- libipset/Makefile.am | 2 +- libipset/Makefile.in | 2 +- src/local.c | 13 ++++++++++++- src/redir.c | 2 +- src/server.c | 2 +- src/tunnel.c | 2 +- src/utils.c | 2 +- src/utils.h | 2 +- 10 files changed, 46 insertions(+), 35 deletions(-) diff --git a/libcork/Makefile b/libcork/Makefile index d7da651b..6344bcc9 100644 --- a/libcork/Makefile +++ b/libcork/Makefile @@ -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 diff --git a/libipset/Makefile b/libipset/Makefile index 105a0802..109678ce 100644 --- a/libipset/Makefile +++ b/libipset/Makefile @@ -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 diff --git a/libipset/Makefile.am b/libipset/Makefile.am index 82c52991..45aa9375 100644 --- a/libipset/Makefile.am +++ b/libipset/Makefile.am @@ -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 diff --git a/libipset/Makefile.in b/libipset/Makefile.in index cfe14a88..469292e5 100644 --- a/libipset/Makefile.in +++ b/libipset/Makefile.in @@ -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 diff --git a/src/local.c b/src/local.c index 826b6af1..3c36933f 100644 --- a/src/local.c +++ b/src/local.c @@ -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__ diff --git a/src/redir.c b/src/redir.c index 0b234409..f2bebdfb 100644 --- a/src/redir.c +++ b/src/redir.c @@ -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 diff --git a/src/server.c b/src/server.c index 2597f8e0..bc51610c 100644 --- a/src/server.c +++ b/src/server.c @@ -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 diff --git a/src/tunnel.c b/src/tunnel.c index e534b699..f57a4401 100644 --- a/src/tunnel.c +++ b/src/tunnel.c @@ -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 diff --git a/src/utils.c b/src/utils.c index e576b374..5a16e406 100644 --- a/src/utils.c +++ b/src/utils.c @@ -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 */ diff --git a/src/utils.h b/src/utils.h index 7026e351..d9b42662 100644 --- a/src/utils.h +++ b/src/utils.h @@ -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