tyler.durden
/
dgamelaunch
mirror of https://github.com/paxed/dgamelaunch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix everything! 

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@309 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-06-18 21:16:50 +00:00
parent 694a7ee6a2
commit aa1a46543b
5 changed files with 73 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.in
View File

@ -12,16 +12,21 @@ CFLAGS = @CFLAGS@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
LEX = @LEX@ LEX = @LEX@
YACC = @YACC@ YACC = @YACC@
MKDEP = @MKDEP@
MKDEP_DIRECT = @MKDEP_DIRECT@
MAN8 = dgamelaunch.8 MAN8 = dgamelaunch.8
EDITOR = @EDITOR@ EDITOR = @EDITOR@
SRCS = $(EDITOR) dgl-common.c ttyrec.c dgamelaunch.c io.c ttyplay.c mygetnstr.c stripgfx.c strlcpy.c strlcat.c y.tab.c lex.yy.c STATIC_SRCS = $(EDITOR) dgl-common.c ttyrec.c dgamelaunch.c io.c ttyplay.c mygetnstr.c stripgfx.c strlcpy.c strlcat.c
DYN_SRCS = y.tab.c lex.yy.c
EXTRA_SRCS = nethackstub.c EXTRA_SRCS = nethackstub.c
DEP_SRCS := $(STATIC_SRCS) $(EXTRA_SRCS) dgl-wall.c
SRCS := $(STATIC_SRCS) $(DYN_SRCS)
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
WALL_OBJS = y.tab.o lex.yy.o dgl-common.o dgl-wall.o strlcat.o strlcpy.o WALL_OBJS = y.tab.o lex.yy.o dgl-common.o dgl-wall.o strlcat.o strlcpy.o
all: $(NAME) dgl-wall all: .depend $(NAME) dgl-wall
$(NAME): $(OBJS) $(NAME): $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
@ -31,7 +36,7 @@ dgl-wall: $(WALL_OBJS)
clean: clean:
rm -f $(NAME) nethackstub dgl-wall rm -f $(NAME) nethackstub dgl-wall
rm -f editors/*.o *.o .#* *~ y.tab.* lex.yy.c .depend rm -f editors/*.o *.o .#* *~ y.tab.* lex.yy.c .depend .depend.bak
distclean: clean distclean: clean
rm -f Makefile config.h config.log config.status rm -f Makefile config.h config.log config.status
@ -63,8 +68,8 @@ dist: .depend distclean
rm -f ../$(NAME)-$(VERSION) rm -f ../$(NAME)-$(VERSION)
@echo "Created source release $(NAME)-$(VERSION).tar.gz" @echo "Created source release $(NAME)-$(VERSION).tar.gz"
.depend: y.tab.c lex.yy.c .depend:
$(CC) -MM $(SRCS) $(EXTRA_SRCS) > .depend $(MKDEP) $(DEP_SRCS) $(MKDEP_DIRECT)
include .depend -include .depend

2
config.y
View File

@ -1,5 +1,7 @@
%{ %{
#define YYSTACK_USE_ALLOCA 0
#include <sys/types.h> #include <sys/types.h>
#include <grp.h> #include <grp.h>

18
configure.ac
View File

@ -7,7 +7,7 @@ AC_PREREQ(2.53)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
AC_PROG_CC AC_PROG_CC(cc gcc)
AC_STDC_HEADERS AC_STDC_HEADERS
AC_PROG_LEX AC_PROG_LEX
@ -24,8 +24,24 @@ esac
if test "$ac_cv_c_compiler_gnu" = yes; then if test "$ac_cv_c_compiler_gnu" = yes; then
CFLAGS="$CFLAGS -Wall -Wno-unused" CFLAGS="$CFLAGS -Wall -Wno-unused"
MKDEP="$CC -MM"
MKDEP_DIRECT="> .depend"
else
AC_CHECK_PROG(MKDEP, mkdep, mkdep,)
if test -z "$MKDEP"; then
AC_CHECK_PROG(MKDEP, makedepend, makedepend,)
if test -n "$MKDEP"; then
MKDEP=":> .depend; $MKDEP -f.depend"
MKDEP_DIRECT=">/dev/null 2>&1" # noisy prick of a program
else
MKDEP=:
fi
fi
fi fi
AC_SUBST(MKDEP)
AC_SUBST(MKDEP_DIRECT)
AC_PROG_INSTALL AC_PROG_INSTALL
AC_SEARCH_LIBS(initscr, [curses ncurses]) AC_SEARCH_LIBS(initscr, [curses ncurses])

1
dgamelaunch.c
View File

@ -81,7 +81,6 @@
#include <unistd.h> #include <unistd.h>
#include <termios.h> #include <termios.h>
#include "y.tab.h"
extern FILE* yyin; extern FILE* yyin;
extern int yyparse (); extern int yyparse ();

87
ee.c
View File

@ -429,7 +429,7 @@ char *argv[];
signal(SIGINT, edit_abort); signal(SIGINT, edit_abort);
d_char = malloc(3); /* provide a buffer for multi-byte chars */ d_char = malloc(3); /* provide a buffer for multi-byte chars */
d_word = malloc(150); d_word = malloc(150);
*d_word = (char) NULL; *d_word = '\0';
d_line = NULL; d_line = NULL;
dlt_line = txtalloc(); dlt_line = txtalloc();
dlt_line->line = d_line; dlt_line->line = d_line;
@ -648,7 +648,7 @@ int disp;
d_char[0] = *point; d_char[0] = *point;
d_char[1] = *(point + 1); d_char[1] = *(point + 1);
} }
d_char[del_width] = (unsigned char) NULL; d_char[del_width] = '\0';
} }
while (temp_pos <= curr_line->line_length) while (temp_pos <= curr_line->line_length)
{ {
@ -676,7 +676,7 @@ int disp;
if (in == 8) if (in == 8)
{ {
d_char[0] = '\n'; d_char[0] = '\n';
d_char[1] = (unsigned char) NULL; d_char[1] = '\0';
} }
tp = point; tp = point;
temp_pos = 1; temp_pos = 1;
@ -688,7 +688,7 @@ int disp;
tp++; tp++;
temp2++; temp2++;
} }
*tp = (char) NULL; *tp = '\0';
free(temp_buff->line); free(temp_buff->line);
free(temp_buff); free(temp_buff);
temp_buff = curr_line; temp_buff = curr_line;
@ -814,7 +814,7 @@ int column;
waddch(window, character); waddch(window, character);
return(1); return(1);
} }
for (i2 = 0; (string[i2] != (char) NULL) && (((column+i2+1)-horiz_offset) < last_col); i2++) for (i2 = 0; (string[i2] != '\0') && (((column+i2+1)-horiz_offset) < last_col); i2++)
waddch(window, string[i2]); waddch(window, string[i2]);
return(strlen((char*)string)); return(strlen((char*)string));
} }
@ -939,13 +939,13 @@ int disp;
temp++; temp++;
} }
temp=point; temp=point;
*temp = (char) NULL; *temp = '\0';
temp = resiz_line((1 - temp_nod->line_length), curr_line, position); temp = resiz_line((1 - temp_nod->line_length), curr_line, position);
curr_line->line_length = 1 + temp - curr_line->line; curr_line->line_length = 1 + temp - curr_line->line;
} }
curr_line->line_length = position; curr_line->line_length = position;
curr_line = temp_nod; curr_line = temp_nod;
*extra = (char) NULL; *extra = '\0';
position = 1; position = 1;
point= curr_line->line; point= curr_line->line;
if (disp) if (disp)
@ -983,9 +983,9 @@ struct text *txtalloc() /* allocate space for line structure */
unsigned char *next_word(string) /* move to next word in string */ unsigned char *next_word(string) /* move to next word in string */
unsigned char *string; unsigned char *string;
{ {
while ((*string != (char) NULL) && ((*string != 32) && (*string != 9))) while ((*string != '\0') && ((*string != 32) && (*string != 9)))
string++; string++;
while ((*string != (char) NULL) && ((*string == 32) || (*string == 9))) while ((*string != '\0') && ((*string == 32) || (*string == 9)))
string++; string++;
return(string); return(string);
} }
@ -1019,7 +1019,7 @@ control() /* use control for commands */
if (in == 1) /* control a */ if (in == 1) /* control a */
{ {
string = get_string(ascii_code_str, TRUE); string = get_string(ascii_code_str, TRUE);
if (*string != (char) NULL) if (*string != '\0')
{ {
in = atoi((char*)string); in = atoi((char*)string);
wmove(text_win, scr_vert, (scr_horz - horiz_offset)); wmove(text_win, scr_vert, (scr_horz - horiz_offset));
@ -1127,7 +1127,7 @@ emacs_control()
else if (in == 15) /* control o */ else if (in == 15) /* control o */
{ {
string = get_string(ascii_code_str, TRUE); string = get_string(ascii_code_str, TRUE);
if (*string != (char) NULL) if (*string != '\0')
{ {
in = atoi((char*)string); in = atoi((char*)string);
wmove(text_win, scr_vert, (scr_horz - horiz_offset)); wmove(text_win, scr_vert, (scr_horz - horiz_offset));
@ -1673,9 +1673,9 @@ int advance; /* if true, skip leading spaces and tabs */
} }
wrefresh(com_win); wrefresh(com_win);
if (esc_flag) if (esc_flag)
in = (char) NULL; in = '\0';
} while ((in != '\n') && (in != '\r')); } while ((in != '\n') && (in != '\r'));
*nam_str = (char) NULL; *nam_str = '\0';
nam_str = tmp_string; nam_str = tmp_string;
if (((*nam_str == ' ') || (*nam_str == 9)) && (advance)) if (((*nam_str == ' ') || (*nam_str == 9)) && (advance))
nam_str = next_word(nam_str); nam_str = next_word(nam_str);
@ -1700,7 +1700,7 @@ int sensitive;
strng1 = string1; strng1 = string1;
strng2 = string2; strng2 = string2;
tmp = 0; tmp = 0;
if ((strng1 == NULL) || (strng2 == NULL) || (*strng1 == (char) NULL) || (*strng2 == (char) NULL)) if ((strng1 == NULL) || (strng2 == NULL) || (*strng1 == '\0') || (*strng2 == '\0'))
return(FALSE); return(FALSE);
equal = TRUE; equal = TRUE;
while (equal) while (equal)
@ -1717,7 +1717,7 @@ int sensitive;
} }
strng1++; strng1++;
strng2++; strng2++;
if ((*strng1 == (char) NULL) || (*strng2 == (char) NULL) || (*strng1 == ' ') || (*strng2 == ' ')) if ((*strng1 == '\0') || (*strng2 == '\0') || (*strng1 == ' ') || (*strng2 == ' '))
break; break;
tmp++; tmp++;
} }
@ -1867,7 +1867,7 @@ check_fp() /* open or close files according to flags */
wmove(com_win, 0, 0); wmove(com_win, 0, 0);
wclrtoeol(com_win); wclrtoeol(com_win);
text_changes = TRUE; text_changes = TRUE;
if ((tmp_file != NULL) && (*tmp_file != (char) NULL)) if ((tmp_file != NULL) && (*tmp_file != '\0'))
wprintw(com_win, file_read_fin_msg, tmp_file); wprintw(com_win, file_read_fin_msg, tmp_file);
} }
wrefresh(com_win); wrefresh(com_win);
@ -2006,7 +2006,7 @@ int *append; /* TRUE if must append more text to end of current line */
point++; point++;
str1++; str1++;
} }
*point = (char) NULL; *point = '\0';
*append = FALSE; *append = FALSE;
if ((num == length) && (*str2 != '\n')) if ((num == length) && (*str2 != '\n'))
*append = TRUE; *append = TRUE;
@ -2044,10 +2044,10 @@ ee_finish() /* prepare to exit edit session */
| portion of file_op() | portion of file_op()
*/ */
if ((file_name == NULL) || (*file_name == (char) NULL)) if ((file_name == NULL) || (*file_name == '\0'))
file_name = get_string(save_file_name_prompt, TRUE); file_name = get_string(save_file_name_prompt, TRUE);
if ((file_name == NULL) || (*file_name == (char) NULL)) if ((file_name == NULL) || (*file_name == '\0'))
{ {
wmove(com_win, 0, 0); wmove(com_win, 0, 0);
wprintw(com_win, file_not_saved_msg); wprintw(com_win, file_not_saved_msg);
@ -2114,7 +2114,7 @@ delete_text()
free(curr_line->next_line); free(curr_line->next_line);
} }
curr_line->next_line = NULL; curr_line->next_line = NULL;
*curr_line->line = (char) NULL; *curr_line->line = '\0';
curr_line->line_length = 1; curr_line->line_length = 1;
curr_line->line_number = 1; curr_line->line_number = 1;
point = curr_line->line; point = curr_line->line;
@ -2217,7 +2217,7 @@ int display_message;
int iter; int iter;
int found; int found;
if ((srch_str == NULL) || (*srch_str == (char) NULL)) if ((srch_str == NULL) || (*srch_str == '\0'))
return(FALSE); return(FALSE);
if (display_message) if (display_message)
{ {
@ -2242,7 +2242,7 @@ int display_message;
if (case_sen) /* if case sensitive */ if (case_sen) /* if case sensitive */
{ {
srch_3 = srch_str; srch_3 = srch_str;
while ((*srch_2 == *srch_3) && (*srch_3 != (char) NULL)) while ((*srch_2 == *srch_3) && (*srch_3 != '\0'))
{ {
found = TRUE; found = TRUE;
srch_2++; srch_2++;
@ -2252,14 +2252,14 @@ int display_message;
else /* if not case sensitive */ else /* if not case sensitive */
{ {
srch_3 = u_srch_str; srch_3 = u_srch_str;
while ((toupper(*srch_2) == *srch_3) && (*srch_3 != (char) NULL)) while ((toupper(*srch_2) == *srch_3) && (*srch_3 != '\0'))
{ {
found = TRUE; found = TRUE;
srch_2++; srch_2++;
srch_3++; srch_3++;
} }
} /* end else */ } /* end else */
if (!((*srch_3 == (char) NULL) && (found))) if (!((*srch_3 == '\0') && (found)))
{ {
found = FALSE; found = FALSE;
if (iter < srch_line->line_length) if (iter < srch_line->line_length)
@ -2327,19 +2327,19 @@ search_prompt() /* prompt and read search string (srch_str) */
{ {
if (srch_str != NULL) if (srch_str != NULL)
free(srch_str); free(srch_str);
if ((u_srch_str != NULL) && (*u_srch_str != (char) NULL)) if ((u_srch_str != NULL) && (*u_srch_str != '\0'))
free(u_srch_str); free(u_srch_str);
srch_str = get_string(search_prompt_str, FALSE); srch_str = get_string(search_prompt_str, FALSE);
gold = FALSE; gold = FALSE;
srch_3 = srch_str; srch_3 = srch_str;
srch_1 = u_srch_str = malloc(strlen((char*)srch_str) + 1); srch_1 = u_srch_str = malloc(strlen((char*)srch_str) + 1);
while (*srch_3 != (char) NULL) while (*srch_3 != '\0')
{ {
*srch_1 = toupper(*srch_3); *srch_1 = toupper(*srch_3);
srch_1++; srch_1++;
srch_3++; srch_3++;
} }
*srch_1 = (char) NULL; *srch_1 = '\0';
search(TRUE); search(TRUE);
} }
@ -2375,7 +2375,7 @@ undel_char() /* undelete last deleted character */
{ {
in = d_char[0]; in = d_char[0];
insert(in); insert(in);
if (d_char[1] != (unsigned char) NULL) if (d_char[1] != '\0')
{ {
in = d_char[1]; in = d_char[1];
insert(in); insert(in);
@ -2417,7 +2417,7 @@ del_word() /* delete word in front of cursor */
d_word2++; d_word2++;
d_word3++; d_word3++;
} }
*d_word2 = (char) NULL; *d_word2 = '\0';
d_wrd_len = difference = d_word2 - d_word; d_wrd_len = difference = d_word2 - d_word;
d_word2 = point; d_word2 = point;
while (tposit < curr_line->line_length) while (tposit < curr_line->line_length)
@ -2428,7 +2428,7 @@ del_word() /* delete word in front of cursor */
d_word3++; d_word3++;
} }
curr_line->line_length -= difference; curr_line->line_length -= difference;
*d_word2 = (char) NULL; *d_word2 = '\0';
draw_line(scr_vert, scr_horz,point,position,curr_line->line_length); draw_line(scr_vert, scr_horz,point,position,curr_line->line_length);
d_char[0] = tmp_char[0]; d_char[0] = tmp_char[0];
d_char[1] = tmp_char[1]; d_char[1] = tmp_char[1];
@ -2481,7 +2481,7 @@ undel_word() /* undelete last deleted word */
} }
curr_line->line_length += d_wrd_len; curr_line->line_length += d_wrd_len;
tmp_old_ptr = point; tmp_old_ptr = point;
*tmp_ptr = (char) NULL; *tmp_ptr = '\0';
tmp_ptr = tmp_space; tmp_ptr = tmp_space;
tposit = 1; tposit = 1;
/* /*
@ -2494,7 +2494,7 @@ undel_word() /* undelete last deleted word */
tmp_ptr++; tmp_ptr++;
tmp_old_ptr++; tmp_old_ptr++;
} }
*tmp_old_ptr = (char) NULL; *tmp_old_ptr = '\0';
free(tmp_space); free(tmp_space);
draw_line(scr_vert, scr_horz, point, position, curr_line->line_length); draw_line(scr_vert, scr_horz, point, position, curr_line->line_length);
} }
@ -2520,8 +2520,7 @@ del_line() /* delete from cursor to end of line */
tposit++; tposit++;
} }
dlt_line->line_length = 1 + tposit - position; dlt_line->line_length = 1 + tposit - position;
*dl1 = (char) NULL; *dl1 = *point = '\0';
*point = (char) NULL;
curr_line->line_length = position; curr_line->line_length = position;
wclrtoeol(text_win); wclrtoeol(text_win);
if (curr_line->next_line != NULL) if (curr_line->next_line != NULL)
@ -2556,7 +2555,7 @@ undel_line() /* undelete last deleted line */
ud1++; ud1++;
ud2++; ud2++;
} }
*ud1 = (char) NULL; *ud1 = '\0';
draw_line(scr_vert, scr_horz,point,position,curr_line->line_length); draw_line(scr_vert, scr_horz,point,position,curr_line->line_length);
} }
@ -3182,9 +3181,9 @@ int arg;
flag = FALSE; flag = FALSE;
string = in_file_name; string = in_file_name;
if ((string == NULL) || (*string == (char) NULL)) if ((string == NULL) || (*string == '\0'))
string = get_string(save_file_name_prompt, TRUE); string = get_string(save_file_name_prompt, TRUE);
if ((string == NULL) || (*string == (char) NULL)) if ((string == NULL) || (*string == '\0'))
{ {
wmove(com_win, 0, 0); wmove(com_win, 0, 0);
wprintw(com_win, file_not_saved_msg); wprintw(com_win, file_not_saved_msg);
@ -3274,7 +3273,7 @@ char *string;
int Counter; int Counter;
temp = string; temp = string;
while (*temp != (char) NULL) while (*temp != '\0')
{ {
if (*temp == '\\') if (*temp == '\\')
{ {
@ -3329,7 +3328,7 @@ struct text *test_line;
return(0); return(0);
pnt = test_line->line; pnt = test_line->line;
if ((pnt == NULL) || (*pnt == (char) NULL) || if ((pnt == NULL) || (*pnt == '\0') ||
(*pnt == '.') || (*pnt == '>')) (*pnt == '.') || (*pnt == '>'))
return(0); return(0);
@ -3338,16 +3337,16 @@ struct text *test_line;
pnt = next_word(pnt); pnt = next_word(pnt);
} }
if (*pnt == (char) NULL) if (*pnt == '\0')
return(0); return(0);
counter = 0; counter = 0;
while ((*pnt != (char) NULL) && ((*pnt != ' ') && (*pnt != '\t'))) while ((*pnt != '\0') && ((*pnt != ' ') && (*pnt != '\t')))
{ {
pnt++; pnt++;
counter++; counter++;
} }
while ((*pnt != (char) NULL) && ((*pnt == ' ') || (*pnt == '\t'))) while ((*pnt != '\0') && ((*pnt == ' ') || (*pnt == '\t')))
{ {
pnt++; pnt++;
counter++; counter++;
@ -3362,9 +3361,9 @@ char * string, *substring;
{ {
char *full, *sub; char *full, *sub;
for (sub = substring; (sub != NULL) && (*sub != (char)NULL); sub++) for (sub = substring; (sub != NULL) && (*sub != '\0'); sub++)
{ {
for (full = string; (full != NULL) && (*full != (char)NULL); for (full = string; (full != NULL) && (*full != '\0');
full++) full++)
{ {
if (*sub == *full) if (*sub == *full)