X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=d6d6c3f2e63499d7301253b41f9881eb72daef08;hp=e022398ca56d8b089bfcd16149097e84b3ca6b26;hb=619867988ebf5dafbf8e1adbda157d85ba9eedeb;hpb=1cd9ca4c09a0e744829b3edb127feb1abd41d35c diff --git a/direct.c b/direct.c index e022398..d6d6c3f 100644 --- a/direct.c +++ b/direct.c @@ -584,7 +584,7 @@ int d_incbin(void) // Attempt to open the include file in the current directory, then (if that // failed) try list of include files passed in the enviroment string or by - // the "-d" option. + // the "-i" option. TOKEN filename = tok[1]; if ((fd = open(string[filename], _OPEN_INC)) < 0) @@ -650,14 +650,14 @@ allright: } } else - return(comma_error); + return error(comma_error); } else pos = lseek(fd, 0L, SEEK_SET); } else { - //size_pos_fallthrough: + // size & pos not given, so assume offset of 0 and all of the binary size = lseek(fd, 0L, SEEK_END); pos = lseek(fd, 0L, SEEK_SET); }