← Back to branch summary

~ubuntu-branches/ubuntu/trusty/cctools/trusty

« back to all changes in this revision

Viewing changes to ftsh/src/ftsh.c

  • Committer: Package Import Robot
  • Author(s): Michael Hanke
  • Date: 2012-06-15 08:30:02 UTC
  • mfrom: (9.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20120615083002-r5nq7iowcv6bm35n
Tags: 3.5.0-1
* New upstream release.
* Remove obsolete patches 'missing_cflags' and 'python_compat'. They have
  been merged upstream.
* Remove DM-upload flag, not needed anymore.
* Bumped Standards-version to 3.9.3, no changes necessary.
* Do not install the new 'apps' binaries. They carry language-specific
  filename extensions, and upstream was asked if renaming is possible. Until
  this is decided they won't be installed to avoid changing the API twice.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ftsh/src/ftsh.c
13
13
#include "ftsh_error.h"
14
14
#include "multi_fork.h"
15
15
 
16
 
#include "xmalloc.h"
 
16
#include "xxmalloc.h"
17
17
#include "stringtools.h"
18
18
#include "macros.h"
19
19
 
177
177
        /* Reset the environment for my children */
178
178
 
179
179
        sprintf(env,"FTSH_VERSION=%d.%d.%d",CCTOOLS_VERSION_MAJOR,CCTOOLS_VERSION_MINOR,CCTOOLS_VERSION_MICRO);
180
 
        putenv(xstrdup(env));
 
180
        putenv(xxstrdup(env));
181
181
 
182
182
        if(log_file) {
183
183
                sprintf(env,"FTSH_LOG_FILE=%s",log_file);
184
 
                putenv(xstrdup(env));
 
184
                putenv(xxstrdup(env));
185
185
        }
186
186
 
187
187
        sprintf(env,"FTSH_LOG_LEVEL=%d",log_level);
188
 
        putenv(xstrdup(env));
 
188
        putenv(xxstrdup(env));
189
189
 
190
190
        if(log_decimal) {
191
191
                sprintf(env,"FTSH_LOG_DECIMAL=");
192
 
                putenv(xstrdup(env));
 
192
                putenv(xxstrdup(env));
193
193
        }
194
194
 
195
195
        sprintf(env,"FTSH_KILL_TIMEOUT=%d",MAX(kill_timeout-5,0));
196
 
        putenv(xstrdup(env));
 
196
        putenv(xxstrdup(env));
197
197
 
198
198
        sprintf(env,"FTSH_KILL_MODE=%s",kill_mode);
199
 
        putenv(xstrdup(env));
 
199
        putenv(xxstrdup(env));
200
200
 
201
201
        sprintf(env,"FTSH_VERSION_MAJOR=%d",CCTOOLS_VERSION_MAJOR);
202
 
        putenv(xstrdup(env));
 
202
        putenv(xxstrdup(env));
203
203
 
204
204
        sprintf(env,"FTSH_VERSION_MINOR=%d",CCTOOLS_VERSION_MINOR);
205
 
        putenv(xstrdup(env));
 
205
        putenv(xxstrdup(env));
206
206
 
207
207
        sprintf(env,"FTSH_VERSION_MICRO=%d",CCTOOLS_VERSION_MICRO);
208
 
        putenv(xstrdup(env));
 
208
        putenv(xxstrdup(env));
209
209
 
210
210
        /* Now, initialize my systems */
211
211
 
267
267
                int i;
268
268
 
269
269
                /* Split the first argument into pieces */
270
 
                string_split_quotes(xstrdup(argv[1]),&tmp_argc,&tmp_argv);
 
270
                string_split_quotes(xxstrdup(argv[1]),&tmp_argc,&tmp_argv);
271
271
 
272
272
                /* Allocate a new argument array */
273
273
                new_argc = tmp_argc + argc;