Skip to content

Commit

Permalink
Remove regex shim
Browse files Browse the repository at this point in the history 
All recent platforms have provided regex.
  • Loading branch information
@jiegec
jiegec committed Apr 11, 2023
1 parent f64a3d1 commit d8e4a45
Show file tree
Hide file tree
Showing 16 changed files with 3 additions and 6,565 deletions.
2 changes: 0 additions & 2 deletions 00MANIFEST
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ node.c
print.c
proc.c
proto.h
regex.h
scripts/
store.c
tests/
Expand Down Expand Up @@ -302,7 +301,6 @@ pdvn.c
prfp.c
ptti.c
rdev.c
regex.c
rmnt.c
rnam.c
rnch.c
Expand Down
6 changes: 2 additions & 4 deletions lib/Makefile.skel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ INCL= ${DINC} -I.. -I../include -Idialects/${DIALECT_DIR}
HDR= common.h proto.h proto.h

SRC= ckkv.c cvfs.c dvch.c fino.c isfn.c lkud.c lsof.c misc.c node.c pdvn.c prfp.c \
print.c proc.c ptti.c rdev.c regex.c rmnt.c rnam.c rnch.c rnmh.c rnmt.c
print.c proc.c ptti.c rdev.c rmnt.c rnam.c rnch.c rnmh.c rnmt.c

OBJ= ckkv.o cvfs.o dvch.o fino.o isfn.o lkud.o lsof.o misc.o node.o pdvn.o prfp.o \
print.o proc.o ptti.o rdev.o regex.o rmnt.o rnam.o rnch.o rnmh.o rnmt.o
print.o proc.o ptti.o rdev.o rmnt.o rnam.o rnch.o rnmh.o rnmt.o

all: ${LIB}

Expand Down Expand Up @@ -49,8 +49,6 @@ ptti.o: ${HDR} ptti.c

rdev.o: ${HDR} rdev.c

regex.o: ${HDR} regex.h regex.c

rmnt.o: ${HDR} rmnt.c

rnam.o: ${HDR} rnam.c
Expand Down
2 changes: 1 addition & 1 deletion lib/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ struct l_dev {

# include <sys/types.h> /* just in case -- because utmp.h
* may need it */
# include "./regex.h"
# include <regex.h>

# if defined(EMPTY)
# undef EMPTY
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/aix/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,6 @@ typedef long long aligned_offset_t __attribute__((aligned(8)));
# define USE_LIB_PRINT_TCPTPI 1 /* ptti.c */
/* #define USE_LIB_READDEV 1 rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
/* #define USE_LIB_RNCH 1 rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/darwin/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,6 @@
# define USE_LIB_PRINT_TCPTPI 1 /* ptti.c */
/* #define USE_LIB_READDEV 1 rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
/* #define USE_LIB_RNCH 1 rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/freebsd/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@ typedef _Bool bool;
# define USE_LIB_PRINT_TCPTPI 1 /* ptti.c */
# define USE_LIB_READDEV 1 /* rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */

# define USE_LIB_RNMH 1 /* rnmh.c */

Expand Down
1 change: 0 additions & 1 deletion lib/dialects/hpux/kmem/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,6 @@

# define USE_LIB_READDEV 1 /* rdev.c */
# define USE_LIB_READMNT 1 /* rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
# define USE_LIB_RNCH 1 /* rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/hpux/pstat/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,6 @@
/* #define USE_LIB_PRINT_TCPTPI 1 ptti.c */
# define USE_LIB_READDEV 1 /* rdev.c */
# define USE_LIB_READMNT 1 /* rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
/* #define USE_LIB_RNCH 1 rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/linux/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@
/* #define USE_LIB_PRINT_TCPTPI 1 ptti.c */
/* #define USE_LIB_READDEV 1 rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
/* #define USE_LIB_RNCH 1 rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/netbsd/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,6 @@
# define USE_LIB_PRINT_TCPTPI 1 /* ptti.c */
# define USE_LIB_READDEV 1 /* rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */

# if defined(NETBSDV) && NETBSDV >= 9099000
# define USE_LIB_RNMT 1 /* rnmt.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/openbsd/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@
# define USE_LIB_PRINT_TCPTPI 1 /* ptti.c */
# define USE_LIB_READDEV 1 /* rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */

/* #define USE_LIB_RNMT 1 rnmt.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/osr/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,6 @@
# define USE_LIB_PRINT_TCPTPI 1 /* ptti.c */
# define USE_LIB_READDEV 1 /* rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
/* #define USE_LIB_RNCH 1 rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/sun/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,6 @@ typedef struct pad_mutex {
/* #define USE_LIB_PRINT_TCPTPI 1 ptti.c */
/* #define USE_LIB_READDEV 1 rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */

# if solaris < 90000
Expand Down
1 change: 0 additions & 1 deletion lib/dialects/uw/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,6 @@
/* #define USE_LIB_PRINT_TCPTPI 1 ptti.c */
# define USE_LIB_READDEV 1 /* rdev.c */
/* #define USE_LIB_READMNT 1 rmnt.c */
/* #define USE_LIB_REGEX 1 regex.c */
/* #define USE_LIB_RNAM 1 rnam.c */
# define USE_LIB_RNCH 1 /* rnch.c */
/* #define USE_LIB_RNMH 1 rnmh.c */
Expand Down
Loading

0 comments on commit d8e4a45

Please sign in to comment.