#if CONFIG_xxx -> #if ENABLE_xxx

This commit is contained in:
Denis Vlasenko 2006-11-01 09:13:26 +00:00
parent 31c65f2456
commit 966ec7c067
3 changed files with 12 additions and 20 deletions

View File

@ -13,21 +13,13 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/ */
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "libbb.h" #include "libbb.h"
# if CONFIG_MD5_SIZE_VS_SPEED < 0 || CONFIG_MD5_SIZE_VS_SPEED > 3 #if CONFIG_MD5_SIZE_VS_SPEED < 0 || CONFIG_MD5_SIZE_VS_SPEED > 3
# define MD5_SIZE_VS_SPEED 2 # define MD5_SIZE_VS_SPEED 2
# else #else
# define MD5_SIZE_VS_SPEED CONFIG_MD5_SIZE_VS_SPEED # define MD5_SIZE_VS_SPEED CONFIG_MD5_SIZE_VS_SPEED
# endif #endif
/* Initialize structure containing state of computation. /* Initialize structure containing state of computation.
* (RFC 1321, 3.3: Step 3) * (RFC 1321, 3.3: Step 3)

View File

@ -1565,7 +1565,7 @@ prepare_to_die:
while (cursor > 0 &&!isspace(command[cursor-1])) while (cursor > 0 &&!isspace(command[cursor-1]))
input_backspace(); input_backspace();
break; break;
#if CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
case 'i'|vbit: case 'i'|vbit:
vi_cmdmode = 0; vi_cmdmode = 0;
break; break;
@ -1697,7 +1697,7 @@ prepare_to_die:
case ESC: case ESC:
#if CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
if (vi_mode) { if (vi_mode) {
/* ESC: insert mode --> command mode */ /* ESC: insert mode --> command mode */
vi_cmdmode = 1; vi_cmdmode = 1;
@ -1749,7 +1749,7 @@ rewrite_line:
/* change command */ /* change command */
len = strlen(strcpy(command, history[cur_history])); len = strlen(strcpy(command, history[cur_history]));
/* redraw and go to eol (bol, in vi */ /* redraw and go to eol (bol, in vi */
#if CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
redraw(cmdedit_y, vi_mode ? 9999:0); redraw(cmdedit_y, vi_mode ? 9999:0);
#else #else
redraw(cmdedit_y, 0); redraw(cmdedit_y, 0);
@ -1797,7 +1797,7 @@ rewrite_line:
} else } else
#endif #endif
{ {
#if CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
if (vi_cmdmode) /* don't self-insert */ if (vi_cmdmode) /* don't self-insert */
break; break;
#endif #endif

View File

@ -2,19 +2,19 @@
#ifndef CMDEDIT_H #ifndef CMDEDIT_H
#define CMDEDIT_H #define CMDEDIT_H
int cmdedit_read_input(char* promptStr, char* command); int cmdedit_read_input(char* promptStr, char* command);
#ifdef CONFIG_ASH #ifdef CONFIG_ASH
extern const char *cmdedit_path_lookup; extern const char *cmdedit_path_lookup;
#endif #endif
#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY #ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
void load_history ( const char *fromfile ); void load_history(const char *fromfile);
void save_history ( const char *tofile ); void save_history(const char *tofile);
#endif #endif
#if CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
void setvimode ( int viflag ); void setvimode(int viflag);
#endif #endif
#endif /* CMDEDIT_H */ #endif /* CMDEDIT_H */