bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix line endings in stdio doors

Browse Source
This commit is contained in:
Andrew Pamment 2016-04-09 10:33:05 +10:00
parent 90986ffbe9
commit d315c1eaa7
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -9,7 +9,7 @@ OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o
$(CC) -c -o $@ $< $(CFLAGS) $(CC) -c -o $@ $< $(CFLAGS)
magicka: $(OBJ) magicka: $(OBJ)
$(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 $(JAMLIB) $(ZMODEM) -lutil $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 $(JAMLIB) $(ZMODEM) -lutil
.PHONY: clean .PHONY: clean

5
doors.c
View File

@ -200,6 +200,11 @@ void rundoor(int socket, struct user_record *user, char *cmd, int stdio) {
disconnect(socket); disconnect(socket);
return; return;
} }
if (c == '\r') {
c == '\n';
} else if (c == '\n' || c == '\0') {
continue;
}
write(master, &c, 1); write(master, &c, 1);
} else if (FD_ISSET(master, &fdset)) { } else if (FD_ISSET(master, &fdset)) {
len = read(master, &c, 1); len = read(master, &c, 1);

2
jamlib/Makefile.linux
View File

@ -1,4 +1,4 @@
CC = gcc $(CPPFLAGS) $(CFLAGS) -D__LINUX__ $(LDFLAGS) -Wall CC = cc $(CPPFLAGS) $(CFLAGS) -D__LINUX__ $(LDFLAGS) -Wall
AR = ar -ru AR = ar -ru
RM = rm -f RM = rm -f