"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libedit/el.h" between
tnftp-20151004.tar.gz and tnftp-20200705.tar.gz

About: tnftp is an enhanced ftp client (prior name "lukemftp").

el.h  (tnftp-20151004):el.h  (tnftp-20200705)
/* $NetBSD: el.h,v 1.2 2005/05/11 01:17:39 lukem Exp $ */ /* $NetBSD: el.h,v 1.5 2020/07/04 13:43:21 lukem Exp $ */
/* from NetBSD: el.h,v 1.16 2003/10/18 23:48:42 christos Exp */ /* from NetBSD: el.h,v 1.45 2019/07/23 10:18:52 christos Exp */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* This code is derived from software contributed to Berkeley by * This code is derived from software contributed to Berkeley by
* Christos Zoulas of Cornell University. * Christos Zoulas of Cornell University.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
skipping to change at line 50 skipping to change at line 50
*/ */
#ifndef _h_el #ifndef _h_el
#define _h_el #define _h_el
/* /*
* Local defaults * Local defaults
*/ */
#define KSHVI #define KSHVI
#define VIDEFAULT #define VIDEFAULT
#define ANCHOR #define ANCHOR
#include <stdio.h> #include "histedit.h"
#include <sys/types.h> #include "chartype.h"
#define EL_BUFSIZ 1024 /* Maximum line size * / #define EL_BUFSIZ ((size_t)1024) /* Maximum line size * /
#define HANDLE_SIGNALS 0x01 #define HANDLE_SIGNALS 0x01
#define NO_TTY 0x02 #define NO_TTY 0x02
#define EDIT_DISABLED 0x04 #define EDIT_DISABLED 0x04
#define UNBUFFERED 0x08 #define UNBUFFERED 0x08
#define NARROW_HISTORY 0x40
typedef int bool_t; /* True or not */ #define NO_RESET 0x80
typedef unsigned char el_action_t; /* Index to command array */ typedef unsigned char el_action_t; /* Index to command array */
typedef struct coord_t { /* Position on the screen */ typedef struct coord_t { /* Position on the screen */
int h; int h;
int v; int v;
} coord_t; } coord_t;
typedef struct el_line_t { typedef struct el_line_t {
char *buffer; /* Input line */ wchar_t *buffer; /* Input line */
char *cursor; /* Cursor position */ wchar_t *cursor; /* Cursor position */
char *lastchar; /* Last character */ wchar_t *lastchar; /* Last character */
const char *limit; /* Max position */ const wchar_t *limit; /* Max position */
} el_line_t; } el_line_t;
/* /*
* Editor state * Editor state
*/ */
typedef struct el_state_t { typedef struct el_state_t {
int inputmode; /* What mode are we in? */ int inputmode; /* What mode are we in? */
int doingarg; /* Are we getting an argument? */ int doingarg; /* Are we getting an argument? */
int argument; /* Numeric argument */ int argument; /* Numeric argument */
int metanext; /* Is the next char a meta char */ int metanext; /* Is the next char a meta char */
el_action_t lastcmd; /* Previous command */ el_action_t lastcmd; /* Previous command */
el_action_t thiscmd; /* this command */ el_action_t thiscmd; /* this command */
char thisch; /* char that generated it */ wchar_t thisch; /* char that generated it */
} el_state_t; } el_state_t;
/* /*
* Until we come up with something better... * Until we come up with something better...
*/ */
#define el_strdup(a) strdup(a)
#define el_malloc(a) malloc(a) #define el_malloc(a) malloc(a)
#define el_calloc(a,b) calloc(a, b)
#define el_realloc(a,b) realloc(a, b) #define el_realloc(a,b) realloc(a, b)
#define el_free(a) free(a) #define el_free(a) free(a)
#include "tty.h" #include "tty.h"
#include "prompt.h" #include "prompt.h"
#include "key.h" #include "literal.h"
#include "term.h" #include "keymacro.h"
#include "terminal.h"
#include "refresh.h" #include "refresh.h"
#include "chared.h" #include "chared.h"
#include "common.h"
#include "search.h" #include "search.h"
#include "hist.h" #include "hist.h"
#include "map.h" #include "map.h"
#include "parse.h"
#include "sig.h" #include "sig.h"
#include "help.h"
#include "read.h" struct el_read_t;
struct editline { struct editline {
char *el_prog; /* the program name */ wchar_t *el_prog; /* the program name */
FILE *el_infile; /* Stdio stuff */
FILE *el_outfile; /* Stdio stuff */ FILE *el_outfile; /* Stdio stuff */
FILE *el_errfile; /* Stdio stuff */ FILE *el_errfile; /* Stdio stuff */
int el_infd; /* Input file descriptor */ int el_infd; /* Input file descriptor */
int el_outfd; /* Output file descriptor */
int el_errfd; /* Error file descriptor */
int el_flags; /* Various flags. */ int el_flags; /* Various flags. */
coord_t el_cursor; /* Cursor location */ coord_t el_cursor; /* Cursor location */
char **el_display; /* Real screen image = what is there */ wint_t **el_display; /* Real screen image = what is there */
char **el_vdisplay; /* Virtual screen image = what we see */ wint_t **el_vdisplay; /* Virtual screen image = what we see */
void *el_data; /* Client data */ void *el_data; /* Client data */
el_line_t el_line; /* The current line information */ el_line_t el_line; /* The current line information */
el_state_t el_state; /* Current editor state */ el_state_t el_state; /* Current editor state */
el_term_t el_term; /* Terminal dependent stuff */ el_terminal_t el_terminal; /* Terminal dependent stuff */
el_tty_t el_tty; /* Tty dependent stuff */ el_tty_t el_tty; /* Tty dependent stuff */
el_refresh_t el_refresh; /* Refresh stuff */ el_refresh_t el_refresh; /* Refresh stuff */
el_prompt_t el_prompt; /* Prompt stuff */ el_prompt_t el_prompt; /* Prompt stuff */
el_prompt_t el_rprompt; /* Prompt stuff */ el_prompt_t el_rprompt; /* Prompt stuff */
el_literal_t el_literal; /* prompt literal bits */
el_chared_t el_chared; /* Characted editor stuff */ el_chared_t el_chared; /* Characted editor stuff */
el_map_t el_map; /* Key mapping stuff */ el_map_t el_map; /* Key mapping stuff */
el_key_t el_key; /* Key binding stuff */ el_keymacro_t el_keymacro; /* Key binding stuff */
el_history_t el_history; /* History stuff */ el_history_t el_history; /* History stuff */
el_search_t el_search; /* Search stuff */ el_search_t el_search; /* Search stuff */
el_signal_t el_signal; /* Signal handling stuff */ el_signal_t el_signal; /* Signal handling stuff */
el_read_t el_read; /* Character reading stuff */ struct el_read_t *el_read; /* Character reading stuff */
ct_buffer_t el_visual; /* Buffer for displayable str */
ct_buffer_t el_scratch; /* Scratch conversion buffer */
ct_buffer_t el_lgcyconv; /* Buffer for legacy wrappers */
LineInfo el_lgcylinfo; /* Legacy LineInfo buffer */
}; };
protected int el_editmode(EditLine *, int, const char **); libedit_private int el_editmode(EditLine *, int, const wchar_t **);
libedit_private EditLine *el_init_internal(const char *, FILE *, FILE *,
FILE *, int, int, int, int);
#ifdef DEBUG #ifdef DEBUG
#define EL_ABORT(a) do { \ #define EL_ABORT(a) do { \
fprintf(el->el_errfile, "%s, %d: ", \ fprintf(el->el_errfile, "%s, %d: ", \
__FILE__, __LINE__); \ __FILE__, __LINE__); \
fprintf a; \ fprintf a; \
abort(); \ abort(); \
} while( /*CONSTCOND*/0); } while( /*CONSTCOND*/0);
#else #else
#define EL_ABORT(a) abort() #define EL_ABORT(a) abort()
 End of changes. 20 change blocks. 
27 lines changed or deleted 36 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)