emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix compilation of sed.

Browse Source 
error: static declaration of 'free_and_close_stuff' follows non-static declaration
  Tiny whitespace cleanup while at it,
  also make sure that we don't use CONFIG_ anymore.

Rob, hope this is ok w/ you..
This commit is contained in:
Bernhard Reutner-Fischer 2006-03-01 20:14:16 +00:00
parent e7c43b66d7
commit b7f39732f8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/sed.c
View File

@ -9,7 +9,7 @@
* Copyright (C) 2003,2004 by Rob Landley <rob@landley.net> * Copyright (C) 2003,2004 by Rob Landley <rob@landley.net>
* *
* MAINTAINER: Rob Landley <rob@landley.net> * MAINTAINER: Rob Landley <rob@landley.net>
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
@ -76,7 +76,7 @@ typedef struct sed_cmd_s {
regex_t *sub_match; /* For 's/sub_match/string/' */ regex_t *sub_match; /* For 's/sub_match/string/' */
int beg_line; /* 'sed 1p' 0 == apply commands to all lines */ int beg_line; /* 'sed 1p' 0 == apply commands to all lines */
int end_line; /* 'sed 1,3p' 0 == one line only. -1 = last line ($) */ int end_line; /* 'sed 1,3p' 0 == one line only. -1 = last line ($) */
FILE *file; /* File (sw) command writes to, -1 for none. */ FILE *file; /* File (sw) command writes to, -1 for none. */
char *string; /* Data string for (saicytb) commands. */ char *string; /* Data string for (saicytb) commands. */
@ -122,8 +122,8 @@ struct append_list {
}; };
static struct append_list *append_head=NULL, *append_tail=NULL; static struct append_list *append_head=NULL, *append_tail=NULL;
void free_and_close_stuff(void); static void free_and_close_stuff(void);
#ifdef CONFIG_FEATURE_CLEAN_UP #if ENABLE_FEATURE_CLEAN_UP
static void free_and_close_stuff(void) static void free_and_close_stuff(void)
{ {
sed_cmd_t *sed_cmd = sed_cmd_head.next; sed_cmd_t *sed_cmd = sed_cmd_head.next;
@ -1200,15 +1200,15 @@ extern int sed_main(int argc, char **argv)
if(-1==(nonstdoutfd=mkstemp(outname))) if(-1==(nonstdoutfd=mkstemp(outname)))
bb_error_msg_and_die("no temp file"); bb_error_msg_and_die("no temp file");
nonstdout=fdopen(nonstdoutfd,"w"); nonstdout=fdopen(nonstdoutfd,"w");
/* Set permissions of output file */ /* Set permissions of output file */
fstat(fileno(file),&statbuf); fstat(fileno(file),&statbuf);
fchmod(nonstdoutfd,statbuf.st_mode); fchmod(nonstdoutfd,statbuf.st_mode);
add_input_file(file); add_input_file(file);
process_files(); process_files();
fclose(nonstdout); fclose(nonstdout);
nonstdout=stdout; nonstdout=stdout;
unlink(argv[i]); unlink(argv[i]);
rename(outname,argv[i]); rename(outname,argv[i]);