Changeset 2c4eb5b5fbb052c18d52a989026b447982cc17c3

Show
Ignore:
Timestamp:
02/07/08 11:57:56 (6 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1202385476 +0000
git-parent:

[11d2dcb8820fdb77c35384ce926e2b7014559bb0]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1202385476 +0000
Message:

pull header-space into the noitedir dir, this makes it stand apart from libedit more trivially.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/noitedit/chared.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040/* 
    4141 * chared.c: Character editor utilities 
    4242 */ 
    43 #include "sys.h" 
     43#include "noitedit/sys.h" 
    4444 
    4545#include <stdlib.h> 
    46 #include "el.h" 
     46#include "noitedit/el.h" 
    4747 
    4848/* value to leave unused in line buffer */ 
  • src/noitedit/chared.h

    rbafab25 r2c4eb5b  
    4848#include <string.h> 
    4949 
    50 #include "histedit.h" 
     50#include "noitedit/histedit.h" 
    5151 
    5252#define EL_MAXMACRO     10 
     
    131131#define MODE_REPLACE_1  2 
    132132 
    133 #include "common.h" 
    134 #include "vi.h" 
    135 #include "emacs.h" 
    136 #include "search.h" 
    137 #include "fcns.h" 
     133#include "noitedit/common.h" 
     134#include "noitedit/vi.h" 
     135#include "noitedit/emacs.h" 
     136#include "noitedit/search.h" 
     137#include "noitedit/fcns.h" 
    138138 
    139139 
  • src/noitedit/common.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * common.c: Common Editor functions 
    5050 */ 
    51 #include "sys.h" 
    52 #include "el.h" 
     51#include "noitedit/sys.h" 
     52#include "noitedit/el.h" 
    5353 
    5454/* ed_end_of_file(): 
  • src/noitedit/compat.h

    rbafab25 r2c4eb5b  
    1818 
    1919#ifndef HAVE_FGETLN 
    20 #include "fgetln.h" 
     20#include "noitedit/fgetln.h" 
    2121#endif 
    2222 
     
    2626 
    2727#ifndef HAVE_STRLCPY 
    28 #include "strlcpy.h" 
     28#include "noitedit/strlcpy.h" 
    2929#endif 
    3030 
  • src/noitedit/el.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * el.c: EditLine interface functions 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252 
    5353#ifdef HAVE_UNISTD_H 
     
    6262#include <stdarg.h> 
    6363#include <pthread.h> 
    64 #include "el.h" 
     64#include "noitedit/el.h" 
    6565 
    6666pthread_key_t tputs_hack; 
  • src/noitedit/el.h

    r11d2dcb r2c4eb5b  
    109109#define el_free(a)      free(a) 
    110110 
    111 #include "tty.h" 
    112 #include "prompt.h" 
    113 #include "key.h" 
    114 #include "el_term.h" 
    115 #include "refresh.h" 
    116 #include "chared.h" 
    117 #include "common.h" 
    118 #include "search.h" 
    119 #include "hist.h" 
    120 #include "map.h" 
    121 #include "parse.h" 
    122 #include "sig.h" 
    123 #include "help.h" 
     111#include "noitedit/tty.h" 
     112#include "noitedit/prompt.h" 
     113#include "noitedit/key.h" 
     114#include "noitedit/el_term.h" 
     115#include "noitedit/refresh.h" 
     116#include "noitedit/chared.h" 
     117#include "noitedit/common.h" 
     118#include "noitedit/search.h" 
     119#include "noitedit/hist.h" 
     120#include "noitedit/map.h" 
     121#include "noitedit/parse.h" 
     122#include "noitedit/sig.h" 
     123#include "noitedit/help.h" 
    124124 
    125125struct editline { 
  • src/noitedit/el_term.h

    rbafab25 r2c4eb5b  
    4545#define _h_el_term 
    4646 
    47 #include "histedit.h" 
     47#include "noitedit/histedit.h" 
    4848 
    4949typedef struct {                /* Symbolic function key bindings       */ 
  • src/noitedit/emacs.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * emacs.c: Emacs functions 
    5050 */ 
    51 #include "sys.h" 
    52 #include "el.h" 
     51#include "noitedit/sys.h" 
     52#include "noitedit/el.h" 
    5353 
    5454/* em_delete_or_list(): 
  • src/noitedit/fgetln.c

    rbafab25 r2c4eb5b  
    22 
    33#include <stdio.h> 
    4 #include "compat.h" 
     4#include "noitedit/compat.h" 
    55 
    66#ifndef HAVE_FGETLN 
  • src/noitedit/hist.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * hist.c: History access functions 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252#include <stdlib.h> 
    53 #include "el.h" 
     53#include "noitedit/el.h" 
    5454 
    5555/* hist_init(): 
  • src/noitedit/hist.h

    rbafab25 r2c4eb5b  
    4545#define _h_el_hist 
    4646 
    47 #include "histedit.h" 
     47#include "noitedit/histedit.h" 
    4848 
    4949typedef int (*hist_fun_t)(ptr_t, HistEvent *, int, ...); 
  • src/noitedit/history.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * hist.c: History access functions 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252 
    5353#include <string.h> 
     
    6161static const char hist_cookie[] = "_HiStOrY_V2_\n"; 
    6262 
    63 #include "histedit.h" 
     63#include "noitedit/histedit.h" 
    6464 
    6565typedef int (*history_gfun_t)(ptr_t, HistEvent *); 
  • src/noitedit/key.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    6767 *         substr of another. 
    6868 */ 
    69 #include "sys.h" 
     69#include "noitedit/sys.h" 
    7070#include <string.h> 
    7171#include <stdlib.h> 
    7272 
    73 #include "el.h" 
     73#include "noitedit/el.h" 
    7474 
    7575/* 
  • src/noitedit/map.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * map.c: Editor function definitions 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252#include <stdlib.h> 
    53 #include "el.h" 
     53#include "noitedit/el.h" 
    5454 
    5555#define N_KEYS 256 
  • src/noitedit/parse.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    5959 *      setty 
    6060 */ 
    61 #include "sys.h" 
    62 #include "el.h" 
    63 #include "tokenizer.h" 
     61#include "noitedit/sys.h" 
     62#include "noitedit/el.h" 
     63#include "noitedit/tokenizer.h" 
    6464#include <stdlib.h> 
    6565 
  • src/noitedit/prompt.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * prompt.c: Prompt printing functions 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252#include <stdio.h> 
    53 #include "el.h" 
     53#include "noitedit/el.h" 
    5454 
    5555private char    *prompt_default(EditLine *); 
  • src/noitedit/prompt.h

    rbafab25 r2c4eb5b  
    4545#define _h_el_prompt 
    4646 
    47 #include "histedit.h" 
     47#include "noitedit/histedit.h" 
    4848 
    4949typedef char * (*el_pfunc_t)(EditLine*); 
  • src/noitedit/read.c

    r5b6ccbe r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    5050 *         Terminal read functions 
    5151 */ 
    52 #include "sys.h" 
     52#include "noitedit/sys.h" 
    5353#include <errno.h> 
    5454#if HAVE_UNISTD_H 
     
    5656#endif 
    5757#include <stdlib.h> 
    58 #include "el.h" 
     58#include "noitedit/el.h" 
    5959 
    6060#define OKCMD     -1 
  • src/noitedit/readline.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141__RCSID("$NetBSD: readline.c,v 1.19 2001/01/10 08:10:45 jdolecek Exp $"); 
     
    5858#endif 
    5959#include <limits.h> 
    60 #include "histedit.h" 
    61 #include "readline/readline.h" 
    62 #include "sys.h" 
    63 #include "el.h" 
    64 #include "fcns.h"             /* for EL_NUM_FCNS */ 
     60#include "noitedit/histedit.h" 
     61#include "noitedit/readline/readline.h" 
     62#include "noitedit/sys.h" 
     63#include "noitedit/el.h" 
     64#include "noitedit/fcns.h"            /* for EL_NUM_FCNS */ 
    6565 
    6666/* for rl_complete() */ 
  • src/noitedit/refresh.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * refresh.c: Lower level screen refreshing functions 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252#include <stdio.h> 
    5353#include <ctype.h> 
     
    5757#include <string.h> 
    5858 
    59 #include "el.h" 
     59#include "noitedit/el.h" 
    6060 
    6161private void    re_addc(EditLine *, int); 
  • src/noitedit/refresh.h

    rbafab25 r2c4eb5b  
    4545#define _h_el_refresh 
    4646 
    47 #include "histedit.h" 
     47#include "noitedit/histedit.h" 
    4848 
    4949typedef struct { 
  • src/noitedit/search.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    5050 */ 
    5151#include "noit_defines.h" 
    52 #include "sys.h" 
     52#include "noitedit/sys.h" 
    5353#include <stdlib.h> 
    5454#if HAVE_SYS_TYPES_H 
     
    6363#include <regexp.h> 
    6464#endif 
    65 #include "el.h" 
     65#include "noitedit/el.h" 
    6666 
    6767/* 
  • src/noitedit/search.h

    rbafab25 r2c4eb5b  
    4545#define _h_el_search 
    4646 
    47 #include "histedit.h" 
     47#include "noitedit/histedit.h" 
    4848 
    4949typedef struct el_search_t { 
  • src/noitedit/sig.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    5151 *        and pass the ball to our caller. 
    5252 */ 
    53 #include "sys.h" 
    54 #include "el.h" 
     53#include "noitedit/sys.h" 
     54#include "noitedit/el.h" 
    5555#include <stdlib.h> 
    5656 
  • src/noitedit/sig.h

    rbafab25 r2c4eb5b  
    4747#include <signal.h> 
    4848 
    49 #include "histedit.h" 
     49#include "noitedit/histedit.h" 
    5050 
    5151/* 
  • src/noitedit/term.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    5050 *         termcap putchar routine does not take an argument! 
    5151 */ 
    52 #include "sys.h" 
     52#include "noitedit/sys.h" 
    5353#include <stdio.h> 
    5454#include <signal.h> 
     
    7070#endif 
    7171 
    72 #include "el.h" 
     72#include "noitedit/el.h" 
    7373 
    7474/* 
  • src/noitedit/tokenizer.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * tokenize.c: Bourne shell like tokenizer 
    5050 */ 
    51 #include "sys.h" 
     51#include "noitedit/sys.h" 
    5252#include <string.h> 
    5353#include <stdlib.h> 
    54 #include "tokenizer.h" 
     54#include "noitedit/tokenizer.h" 
    5555 
    5656typedef enum { 
  • src/noitedit/tty.c

    r11d2dcb r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * tty.c: tty interface stuff 
    5050 */ 
    51 #include "sys.h" 
    52 #include "el.h" 
    53 #include "tty.h" 
     51#include "noitedit/sys.h" 
     52#include "noitedit/el.h" 
     53#include "noitedit/tty.h" 
    5454 
    5555typedef struct ttymodes_t { 
  • src/noitedit/tty.h

    rbafab25 r2c4eb5b  
    4646 
    4747#include "noit_defines.h" 
    48 #include "histedit.h" 
     48#include "noitedit/histedit.h" 
    4949 
    5050/* Define our own since everyone gets it wrong! */ 
  • src/noitedit/vi.c

    rbafab25 r2c4eb5b  
    3737 */ 
    3838 
    39 #include "compat.h" 
     39#include "noitedit/compat.h" 
    4040#if !defined(lint) && !defined(SCCSID) 
    4141#if 0 
     
    4949 * vi.c: Vi mode commands. 
    5050 */ 
    51 #include "sys.h" 
    52 #include "el.h" 
     51#include "noitedit/sys.h" 
     52#include "noitedit/el.h" 
    5353 
    5454private el_action_t     cv_action(EditLine *, int);