ruby-changes:19525
From: kosaki <ko1@a...>
Date: Sat, 14 May 2011 19:49:59 +0900 (JST)
Subject: [ruby-changes:19525] kosaki:r31565 (trunk): introduce missing/setproctitle.c
kosaki 2011-05-14 19:49:47 +0900 (Sat, 14 May 2011) New Revision: 31565 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31565 Log: introduce missing/setproctitle.c * include/ruby/missing.h: add setproctitle() declaration. * missing/setproctitle.c: added. * configure.in: add check for missing/setproctitle.c. * ruby.c (ruby_process_options): add to call compat_init_setproctitle(). * ruby.c (set_arg0): remove all platform specific code. it's moved to missing/setproctitle.c. * ruby.c (origarg): remove len field. It's no longer used. * ruby.c (get_arglen): removed. Added files: trunk/missing/setproctitle.c Modified files: trunk/ChangeLog trunk/configure.in trunk/include/ruby/missing.h trunk/ruby.c Index: include/ruby/missing.h =================================================================== --- include/ruby/missing.h (revision 31564) +++ include/ruby/missing.h (revision 31565) @@ -191,6 +191,10 @@ RUBY_EXTERN int ruby_close(int); #endif +#ifndef HAVE_SETPROCTITLE +RUBY_EXTERN void setproctitle(const char *fmt, ...); +#endif + #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility pop #endif Index: configure.in =================================================================== --- configure.in (revision 31564) +++ configure.in (revision 31565) @@ -1294,7 +1294,15 @@ AC_REPLACE_FUNCS(dup2 memmove strerror\ strchr strstr crypt flock\ isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \ - strlcpy strlcat ffs) + strlcpy strlcat ffs setproctitle) + +# for missing/setproctitle.c +AS_CASE(["$target_os"], +[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)], +[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ], +[]) + + AC_CACHE_CHECK(for signbit, rb_cv_have_signbit, [AC_TRY_LINK([ #include <math.h> Index: ChangeLog =================================================================== --- ChangeLog (revision 31564) +++ ChangeLog (revision 31565) @@ -1,3 +1,18 @@ +Sat May 14 19:37:31 2011 KOSAKI Motohiro <kosaki.motohiro@g...> + + * include/ruby/missing.h: add setproctitle() declaration. + * missing/setproctitle.c: added. + * configure.in: add check for missing/setproctitle.c. + + * ruby.c (ruby_process_options): add to call compat_init_setproctitle(). + * ruby.c (set_arg0): remove all platform specific code. it's + moved to missing/setproctitle.c. + * ruby.c (origarg): remove len field. It's no longer used. + * ruby.c (get_arglen): removed. + + This patch makes a lot of cleanup set_arg0 related code and fixes + [Feature #4689]. + Sat May 14 17:42:21 2011 CHIKANAGA Tomoyuki <nagachika00@g...> * process.c (rb_proc_times): improve documentation. Index: ruby.c =================================================================== --- ruby.c (revision 31564) +++ ruby.c (revision 31565) @@ -124,9 +124,6 @@ static struct { int argc; char **argv; -#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE) - size_t len; -#endif } origarg; static void @@ -1680,62 +1677,6 @@ return load_file(rb_parser_new(), fname, 0, cmdline_options_init(&opt)); } -#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE) -#if !defined(_WIN32) -#define USE_ENVSPACE_FOR_ARG0 -#endif - -#ifdef USE_ENVSPACE_FOR_ARG0 -extern char **environ; -#endif - -static size_t -get_arglen(int argc, char **argv) -{ - char *s = argv[0]; - int i; - - if (!argc) return 0; - s += strlen(s); - /* See if all the arguments are contiguous in memory */ - for (i = 1; i < argc; i++) { - if (argv[i] == s + 1) { - s++; - s += strlen(s); /* this one is ok too */ - } - else { - break; - } - } -#if defined(USE_ENVSPACE_FOR_ARG0) - if (environ && (s+1 == environ[0])) { - s++; - s += strlen(s); - for (i = 1; environ[i]; i++) { - if (environ[i] == s + 1) { - s++; - s += strlen(s); /* this one is ok too */ - } - } -# if defined(HAVE_SETENV) && defined(HAVE_UNSETENV) - { - char *t = malloc(s - environ[0] + 1); - for (i = 0; environ[i]; i++) { - size_t len = strlen(environ[i]) + 1; - memcpy(t, environ[i], len); - environ[i] = t; - t += len; - } - } -# else - ruby_setenv("", NULL); /* duplicate environ vars */ -# endif - } -#endif - return s - argv[0]; -} -#endif - static void set_arg0(VALUE val, ID id) { @@ -1747,42 +1688,9 @@ StringValue(val); s = RSTRING_PTR(val); i = RSTRING_LEN(val); -#if defined(PSTAT_SETCMD) - if (i > PST_CLEN) { - union pstun un; - char buf[PST_CLEN + 1]; /* PST_CLEN is 64 (HP-UX 11.23) */ - strlcpy(buf, s, sizeof(buf)); - un.pst_command = buf; - pstat(PSTAT_SETCMD, un, PST_CLEN, 0, 0); - } - else { - union pstun un; - un.pst_command = s; - pstat(PSTAT_SETCMD, un, i, 0, 0); - } -#elif defined(HAVE_SETPROCTITLE) + setproctitle("%.*s", (int)i, s); -#else - if ((size_t)i > origarg.len - origarg.argc) { - i = (long)(origarg.len - origarg.argc); - } - - memcpy(origarg.argv[0], s, i); - - { - int j; - char *t = origarg.argv[0] + i; - *t = '\0'; - - if ((size_t)(i + 1) < origarg.len) { - memset(t + 1, '\0', origarg.len - i - 1); - } - for (j = 1; j < origarg.argc; j++) { - origarg.argv[j] = t; - } - } -#endif rb_progname = rb_obj_freeze(rb_external_str_new(s, i)); } @@ -1891,6 +1799,14 @@ rb_argv0 = rb_str_new4(rb_progname); rb_gc_register_mark_object(rb_argv0); iseq = process_options(argc, argv, cmdline_options_init(&opt)); + +#ifndef HAVE_SETPROCTITLE + { + extern compat_init_setproctitle(int argc, char *argv[]); + compat_init_setproctitle(argc, argv); + } +#endif + return (void*)(struct RData*)iseq; } @@ -1903,9 +1819,6 @@ #endif origarg.argc = *argc; origarg.argv = *argv; -#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE) - origarg.len = get_arglen(origarg.argc, origarg.argv); -#endif #if defined(USE_DLN_A_OUT) dln_argv0 = origarg.argv[0]; #endif Index: missing/setproctitle.c =================================================================== --- missing/setproctitle.c (revision 0) +++ missing/setproctitle.c (revision 31565) @@ -0,0 +1,160 @@ +/* Based on setproctitle.c from openssh-5.6p1 */ +/* Based on conf.c from UCB sendmail 8.8.8 */ + +/* + * Copyright 2003 Damien Miller + * Copyright (c) 1983, 1995-1997 Eric P. Allman + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "ruby.h" + +#ifndef HAVE_SETPROCTITLE + +#include <stdarg.h> +#include <stdlib.h> +#include <unistd.h> +#ifdef HAVE_SYS_PSTAT_H +#include <sys/pstat.h> +#endif +#include <string.h> + +#define SPT_NONE 0 /* don't use it at all */ +#define SPT_PSTAT 1 /* use pstat(PSTAT_SETCMD, ...) */ +#define SPT_REUSEARGV 2 /* cover argv with title information */ + +#ifndef SPT_TYPE +# define SPT_TYPE SPT_NONE +#endif + +#ifndef SPT_PADCHAR +# define SPT_PADCHAR '\0' +#endif + +#if SPT_TYPE == SPT_REUSEARGV +static char *argv_start = NULL; +static size_t argv_env_len = 0; +static size_t argv_len = 0; +#endif + +#endif /* HAVE_SETPROCTITLE */ + +void +compat_init_setproctitle(int argc, char *argv[]) +{ +#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV + extern char **environ; + char *lastargv = NULL; + char *lastenvp = NULL; + char **envp = environ; + int i; + + /* + * NB: This assumes that argv has already been copied out of the + * way. This is true for sshd, but may not be true for other + * programs. Beware. + */ + + if (argc == 0 || argv[0] == NULL) + return; + + /* Fail if we can't allocate room for the new environment */ + for (i = 0; envp[i] != NULL; i++) + ; + if ((environ = calloc(i + 1, sizeof(*environ))) == NULL) { + environ = envp; /* put it back */ + return; + } + + /* + * Find the last argv string or environment variable within + * our process memory area. + */ + for (i = 0; i < argc; i++) { + if (lastargv == NULL || lastargv + 1 == argv[i]) + lastargv = argv[i] + strlen(argv[i]); + } + lastenvp = lastargv; + for (i = 0; envp[i] != NULL; i++) { + if (lastenvp + 1 == envp[i]) + lastenvp = envp[i] + strlen(envp[i]); + } + + argv[1] = NULL; + argv_start = argv[0]; + argv_len = lastargv - argv[0]; + argv_env_len = lastenvp - argv[0]; + + /* + * Copy environment + * XXX - will truncate env on strdup fail + */ + for (i = 0; envp[i] != NULL; i++) + environ[i] = strdup(envp[i]); + environ[i] = NULL; +#endif /* SPT_REUSEARGV */ +} + +#ifndef HAVE_SETPROCTITLE +void +setproctitle(const char *fmt, ...) +{ +#if SPT_TYPE != SPT_NONE + va_list ap; + char ptitle[1024]; + size_t len; + size_t argvlen; +#if SPT_TYPE == SPT_PSTAT + union pstun pst; +#endif + +#if SPT_TYPE == SPT_REUSEARGV + if (argv_env_len <= 0) + return; +#endif + + va_start(ap, fmt); + if (fmt != NULL) { + vsnprintf(ptitle, sizeof(ptitle) , fmt, ap); + } + va_end(ap); + +#if SPT_TYPE == SPT_PSTAT + pst.pst_command = ptitle; + pstat(PSTAT_SETCMD, pst, strlen(ptitle), 0, 0); +#elif SPT_TYPE == SPT_REUSEARGV + len = strlcpy(argv_start, ptitle, argv_env_len); + argvlen = len > argv_len ? argv_env_len : argv_len; + for(; len < argvlen; len++) + argv_start[len] = SPT_PADCHAR; +#endif + +#endif /* SPT_NONE */ +} + +#endif /* HAVE_SETPROCTITLE */ Property changes on: missing/setproctitle.c ___________________________________________________________________ Added: svn:eol-style + LF -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/