diff options
Diffstat (limited to 'usr.bin/less')
| -rw-r--r-- | usr.bin/less/Makefile.in | 7 | ||||
| -rw-r--r-- | usr.bin/less/lglob.h | 65 |
2 files changed, 2 insertions, 70 deletions
diff --git a/usr.bin/less/Makefile.in b/usr.bin/less/Makefile.in index 57cd0104837..3cb3c0eb9f0 100644 --- a/usr.bin/less/Makefile.in +++ b/usr.bin/less/Makefile.in @@ -48,7 +48,7 @@ OBJ = main.${O} screen.${O} brac.${O} ch.${O} charset.${O} cmdbuf.${O} \ output.${O} position.${O} prompt.${O} search.${O} signal.${O} \ tags.${O} ttyin.${O} version.${O} @REGEX_O@ -all: less lesskey lessecho +all: less lesskey less: ${OBJ} ${CC} ${LDFLAGS} -o $@ ${OBJ} ${LIBS} @@ -56,9 +56,6 @@ less: ${OBJ} lesskey: lesskey.${O} version.${O} ${CC} ${LDFLAGS} -o $@ lesskey.${O} version.${O} -lessecho: lessecho.${O} version.${O} - ${CC} ${LDFLAGS} -o $@ lessecho.${O} version.${O} - ${OBJ}: ${srcdir}/less.h ${srcdir}/funcs.h defines.h filename.${O}: ${srcdir}/filename.c @@ -67,7 +64,6 @@ filename.${O}: ${srcdir}/filename.c install: all ${srcdir}/lesskey.nro ${INSTALL_PROGRAM} less ${bindir}/${binprefix}less ${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey - ${INSTALL_PROGRAM} lessecho ${bindir}/${binprefix}lessecho install-strip: ${MAKE} INSTALL_PROGRAM='${INSTALL_PROGRAM} -s' install @@ -76,7 +72,6 @@ install-strip: # sh ${srcdir}/mkinstalldirs ${bindir} ${mandir}/man${manext} uninstall: - rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey ${bindir}/${binprefix}lessecho rm -f ${mandir}/man${manext}/${manprefix}less.${manext} ${mandir}/man${manext}/${manprefix}lesskey.${manext} info: diff --git a/usr.bin/less/lglob.h b/usr.bin/less/lglob.h index f2b49cef635..b81c655f58e 100644 --- a/usr.bin/less/lglob.h +++ b/usr.bin/less/lglob.h @@ -22,17 +22,7 @@ * matching filenames as a single space-separated string. */ -#if OS2 - -#define DECL_GLOB_LIST(list) char **list; char **pp; -#define GLOB_LIST(filename,list) list = _fnexplode(filename) -#define GLOB_LIST_FAILED(list) list == NULL -#define SCAN_GLOB_LIST(list,p) pp = list; *pp != NULL; pp++ -#define INIT_GLOB_LIST(list,p) p = *pp -#define GLOB_LIST_DONE(list) _fnexplodefree(list) - -#else -#if MSDOS_COMPILER==DJGPPC +#include <glob.h> #define DECL_GLOB_LIST(list) glob_t list; int i; #define GLOB_LIST(filename,list) glob(filename,GLOB_NOCHECK,0,&list) @@ -40,56 +30,3 @@ #define SCAN_GLOB_LIST(list,p) i = 0; i < list.gl_pathc; i++ #define INIT_GLOB_LIST(list,p) p = list.gl_pathv[i] #define GLOB_LIST_DONE(list) globfree(&list) - -#else -#if MSDOS_COMPILER==MSOFTC || MSDOS_COMPILER==BORLANDC - -#define GLOB_FIRST_NAME(filename,fndp,h) h = _dos_findfirst(filename, ~_A_VOLID, fndp) -#define GLOB_FIRST_FAILED(handle) ((handle) != 0) -#define GLOB_NEXT_NAME(handle,fndp) _dos_findnext(fndp) -#define GLOB_NAME_DONE(handle) -#define GLOB_NAME name -#define DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle) \ - struct find_t fnd; \ - char drive[_MAX_DRIVE]; \ - char dir[_MAX_DIR]; \ - char fname[_MAX_FNAME]; \ - char ext[_MAX_EXT]; \ - int handle; -#else -#if MSDOS_COMPILER==WIN32C && defined(_MSC_VER) - -#define GLOB_FIRST_NAME(filename,fndp,h) h = _findfirst(filename, fndp) -#define GLOB_FIRST_FAILED(handle) ((handle) == -1) -#define GLOB_NEXT_NAME(handle,fndp) _findnext(handle, fndp) -#define GLOB_NAME_DONE(handle) _findclose(handle) -#define GLOB_NAME name -#define DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle) \ - struct _finddata_t fnd; \ - char drive[_MAX_DRIVE]; \ - char dir[_MAX_DIR]; \ - char fname[_MAX_FNAME]; \ - char ext[_MAX_EXT]; \ - long handle; - -#else -#if MSDOS_COMPILER==WIN32C && !defined(_MSC_VER) /* Borland C for Windows */ - -#define GLOB_FIRST_NAME(filename,fndp,h) h = findfirst(filename, fndp, ~FA_LABEL) -#define GLOB_FIRST_FAILED(handle) ((handle) != 0) -#define GLOB_NEXT_NAME(handle,fndp) findnext(fndp) -#define GLOB_NAME_DONE(handle) -#define GLOB_NAME ff_name -#define DECL_GLOB_NAME(fnd,drive,dir,fname,ext,handle) \ - struct ffblk fnd; \ - char drive[MAXDRIVE]; \ - char dir[MAXDIR]; \ - char fname[MAXFILE]; \ - char ext[MAXEXT]; \ - int handle; - -#endif -#endif -#endif -#endif -#endif |