<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14352] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14352">14352</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-07-24 13:20:37 -0500 (Fri, 24 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>use FREESWITCH_OPTS env var to hold a string of desired command line switches</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitchc">freeswitch/trunk/src/switch.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitchc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch.c (14351 => 14352)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch.c 2009-07-24 18:04:35 UTC (rev 14351)
+++ freeswitch/trunk/src/switch.c 2009-07-24 18:20:37 UTC (rev 14352)
</span><span class="lines">@@ -269,7 +269,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> int nc = 0; /* TRUE if we are running in noconsole mode */
</span><span class="cx"> pid_t pid = 0;
</span><del>- int x;
</del><ins>+ int i,x;
+ char *opts;
+ char opts_str[1024] = "";
+ char *local_argv[1024] = { 0 };
+ char *arg_argv[128] = { 0 };
</ins><span class="cx"> char *usageDesc;
</span><span class="cx"> int alt_dirs = 0;
</span><span class="cx"> int known_opt;
</span><span class="lines">@@ -284,7 +288,20 @@
</span><span class="cx"> int waste = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (argv[0] && strstr(argv[0], "freeswitchd")) {
</del><ins>+ for (x = 0; x < argc; x++) {
+ local_argv[x] = argv[x];
+ }
+
+ if ((opts = getenv("FREESWITCH_OPTS"))) {
+ strncpy(opts_str, opts, sizeof(opts_str) - 1);
+ i = switch_separate_string(opts_str, ' ', arg_argv, (sizeof(arg_argv) / sizeof(arg_argv[0])));
+ for (x = 0; x < i; x++) {
+ local_argv[argc++] = arg_argv[x];
+ }
+ }
+
+
+ if (local_argv[0] && strstr(local_argv[0], "freeswitchd")) {
</ins><span class="cx"> nc++;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -321,11 +338,11 @@
</span><span class="cx"> known_opt = 0;
</span><span class="cx"> #ifdef WIN32
</span><span class="cx"> if (x == 1) {
</span><del>- if (argv[x] && !strcmp(argv[x], "-service")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-service")) {
</ins><span class="cx"> /* New installs will always have the service name specified, but keep a default for compat */
</span><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- switch_copy_string(service_name, argv[x], SERVICENAME_MAXLEN);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ switch_copy_string(service_name, local_argv[x], SERVICENAME_MAXLEN);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_copy_string(service_name, SERVICENAME_DEFAULT, SERVICENAME_MAXLEN);
</span><span class="cx"> }
</span><span class="lines">@@ -343,12 +360,12 @@
</span><span class="cx"> exit(0);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (argv[x] && !strcmp(argv[x], "-install")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-install")) {
</ins><span class="cx"> char exePath[1024];
</span><span class="cx"> char servicePath[1024];
</span><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- switch_copy_string(service_name, argv[x], SERVICENAME_MAXLEN);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ switch_copy_string(service_name, local_argv[x], SERVICENAME_MAXLEN);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_copy_string(service_name, SERVICENAME_DEFAULT, SERVICENAME_MAXLEN);
</span><span class="cx"> }
</span><span class="lines">@@ -386,10 +403,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-uninstall")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-uninstall")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- switch_copy_string(service_name, argv[x], SERVICENAME_MAXLEN);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ switch_copy_string(service_name, local_argv[x], SERVICENAME_MAXLEN);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_copy_string(service_name, SERVICENAME_DEFAULT, SERVICENAME_MAXLEN);
</span><span class="cx"> }
</span><span class="lines">@@ -418,29 +435,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else
</span><del>- if (argv[x] && !strcmp(argv[x], "-u")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-u")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- runas_user = argv[x];
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ runas_user = local_argv[x];
</ins><span class="cx"> }
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-g")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-g")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- runas_group = argv[x];
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ runas_group = local_argv[x];
</ins><span class="cx"> }
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-nf")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-nf")) {
</ins><span class="cx"> nf++;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> #ifdef HAVE_SETRLIMIT
</span><del>- if (argv[x] && !strcmp(argv[x], "-core")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-core")) {
</ins><span class="cx"> memset(&rlp, 0, sizeof(rlp));
</span><span class="cx"> rlp.rlim_cur = RLIM_INFINITY;
</span><span class="cx"> rlp.rlim_max = RLIM_INFINITY;
</span><span class="lines">@@ -448,55 +465,55 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-waste")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-waste")) {
</ins><span class="cx"> waste++;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-hp")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-hp")) {
</ins><span class="cx"> high_prio++;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-nosql")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-nosql")) {
</ins><span class="cx"> flags &= ~SCF_USE_SQL;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-nonat")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-nonat")) {
</ins><span class="cx"> flags &= ~SCF_USE_AUTO_NAT;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-vg")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-vg")) {
</ins><span class="cx"> flags |= SCF_VG;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-stop")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-stop")) {
</ins><span class="cx"> return freeswitch_kill_background();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-nc")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-nc")) {
</ins><span class="cx"> nc++;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-c")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-c")) {
</ins><span class="cx"> nc = 0;
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-conf")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-conf")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(argv[x]) + 1);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(local_argv[x]) + 1);
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.conf_dir) {
</span><span class="cx"> fprintf(stderr, "Allocation error\n");
</span><span class="cx"> return 255;
</span><span class="cx"> }
</span><del>- strcpy(SWITCH_GLOBAL_dirs.conf_dir, argv[x]);
</del><ins>+ strcpy(SWITCH_GLOBAL_dirs.conf_dir, local_argv[x]);
</ins><span class="cx"> alt_dirs++;
</span><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "When using -conf you must specify a config directory\n");
</span><span class="lines">@@ -505,15 +522,15 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-mod")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-mod")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- SWITCH_GLOBAL_dirs.mod_dir = (char *) malloc(strlen(argv[x]) + 1);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ SWITCH_GLOBAL_dirs.mod_dir = (char *) malloc(strlen(local_argv[x]) + 1);
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.mod_dir) {
</span><span class="cx"> fprintf(stderr, "Allocation error\n");
</span><span class="cx"> return 255;
</span><span class="cx"> }
</span><del>- strcpy(SWITCH_GLOBAL_dirs.mod_dir, argv[x]);
</del><ins>+ strcpy(SWITCH_GLOBAL_dirs.mod_dir, local_argv[x]);
</ins><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "When using -mod you must specify a module directory\n");
</span><span class="cx"> return 255;
</span><span class="lines">@@ -521,15 +538,15 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-log")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-log")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(strlen(argv[x]) + 1);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(strlen(local_argv[x]) + 1);
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.log_dir) {
</span><span class="cx"> fprintf(stderr, "Allocation error\n");
</span><span class="cx"> return 255;
</span><span class="cx"> }
</span><del>- strcpy(SWITCH_GLOBAL_dirs.log_dir, argv[x]);
</del><ins>+ strcpy(SWITCH_GLOBAL_dirs.log_dir, local_argv[x]);
</ins><span class="cx"> alt_dirs++;
</span><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "When using -log you must specify a log directory\n");
</span><span class="lines">@@ -538,15 +555,15 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-db")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-db")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(strlen(argv[x]) + 1);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(strlen(local_argv[x]) + 1);
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.db_dir) {
</span><span class="cx"> fprintf(stderr, "Allocation error\n");
</span><span class="cx"> return 255;
</span><span class="cx"> }
</span><del>- strcpy(SWITCH_GLOBAL_dirs.db_dir, argv[x]);
</del><ins>+ strcpy(SWITCH_GLOBAL_dirs.db_dir, local_argv[x]);
</ins><span class="cx"> alt_dirs++;
</span><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "When using -db you must specify a db directory\n");
</span><span class="lines">@@ -555,15 +572,15 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-scripts")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-scripts")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(argv[x]) + 1);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(local_argv[x]) + 1);
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.script_dir) {
</span><span class="cx"> fprintf(stderr, "Allocation error\n");
</span><span class="cx"> return 255;
</span><span class="cx"> }
</span><del>- strcpy(SWITCH_GLOBAL_dirs.script_dir, argv[x]);
</del><ins>+ strcpy(SWITCH_GLOBAL_dirs.script_dir, local_argv[x]);
</ins><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "When using -scripts you must specify a scripts directory\n");
</span><span class="cx"> return 255;
</span><span class="lines">@@ -571,15 +588,15 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (argv[x] && !strcmp(argv[x], "-htdocs")) {
</del><ins>+ if (local_argv[x] && !strcmp(local_argv[x], "-htdocs")) {
</ins><span class="cx"> x++;
</span><del>- if (argv[x] && strlen(argv[x])) {
- SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(strlen(argv[x]) + 1);
</del><ins>+ if (local_argv[x] && strlen(local_argv[x])) {
+ SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(strlen(local_argv[x]) + 1);
</ins><span class="cx"> if (!SWITCH_GLOBAL_dirs.htdocs_dir) {
</span><span class="cx"> fprintf(stderr, "Allocation error\n");
</span><span class="cx"> return 255;
</span><span class="cx"> }
</span><del>- strcpy(SWITCH_GLOBAL_dirs.htdocs_dir, argv[x]);
</del><ins>+ strcpy(SWITCH_GLOBAL_dirs.htdocs_dir, local_argv[x]);
</ins><span class="cx"> } else {
</span><span class="cx"> fprintf(stderr, "When using -htdocs you must specify a htdocs directory\n");
</span><span class="cx"> return 255;
</span><span class="lines">@@ -587,7 +604,7 @@
</span><span class="cx"> known_opt++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!known_opt || (argv[x] && (!strcmp(argv[x], "-help") || !strcmp(argv[x], "-h") || !strcmp(argv[x], "-?")))) {
</del><ins>+ if (!known_opt || (local_argv[x] && (!strcmp(local_argv[x], "-help") || !strcmp(local_argv[x], "-h") || !strcmp(local_argv[x], "-?")))) {
</ins><span class="cx"> printf("%s\n", usageDesc);
</span><span class="cx"> exit(0);
</span><span class="cx"> }
</span><span class="lines">@@ -625,7 +642,7 @@
</span><span class="cx"> int i = 0;
</span><span class="cx">
</span><span class="cx"> fprintf(stderr, "Error: stacksize %d is too large: run ulimit -s %d or run %s -waste.\nauto-adjusting stack size for optimal performance....\n",
</span><del>- (int)(rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024, argv[0]);
</del><ins>+ (int)(rlp.rlim_max / 1024), SWITCH_THREAD_STACKSIZE / 1024, local_argv[0]);
</ins><span class="cx">
</span><span class="cx"> memset(&rlp, 0, sizeof(rlp));
</span><span class="cx"> rlp.rlim_cur = SWITCH_THREAD_STACKSIZE;
</span><span class="lines">@@ -633,10 +650,10 @@
</span><span class="cx"> setrlimit(RLIMIT_STACK, &rlp);
</span><span class="cx">
</span><span class="cx"> apr_terminate();
</span><del>- ret = (int)execv(argv[0], argv);
</del><ins>+ ret = (int)execv(local_argv[0], local_argv);
</ins><span class="cx">
</span><span class="cx"> for(i = 0; i < argc; i++) {
</span><del>- switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", argv[i]);
</del><ins>+ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", local_argv[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return system(buf);
</span><span class="lines">@@ -726,13 +743,13 @@
</span><span class="cx"> char buf[1024] = "";
</span><span class="cx"> int i = 0;
</span><span class="cx">
</span><del>- switch_assert(argv[0]);
</del><ins>+ switch_assert(local_argv[0]);
</ins><span class="cx"> switch_sleep(1000000);
</span><del>- ret = (int)execv(argv[0], argv);
</del><ins>+ ret = (int)execv(local_argv[0], local_argv);
</ins><span class="cx"> fprintf(stderr, "Restart Failed [%s] resorting to plan b\n", strerror(errno));
</span><span class="cx">
</span><span class="cx"> for(i = 0; i < argc; i++) {
</span><del>- switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", argv[i]);
</del><ins>+ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", local_argv[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ret = system(buf);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>