sieni
/
fbDOOM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from vvaltchev/master 

Small fixes by @vvaltchev
This commit is contained in:
Maxime Vincent 2019-11-19 14:56:00 +01:00 committed by GitHub
parent b92e06b108 f5725ff6f2
commit 476a0cef4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fbdoom/Makefile
View File

@ -23,7 +23,11 @@ CC=$(CROSS_COMPILE)gcc # gcc or g++
CFLAGS+=-ggdb3 -Os CFLAGS+=-ggdb3 -Os
LDFLAGS+=-Wl,--gc-sections LDFLAGS+=-Wl,--gc-sections
CFLAGS+=-ggdb3 -Wall -DNORMALUNIX -DLINUX -DSNDSERV # -DUSEASM CFLAGS+=-ggdb3 -Wall -DNORMALUNIX -DLINUX -DSNDSERV # -DUSEASM
LIBS+=-lm -lc -lSDL LIBS+=-lm -lc
ifneq ($(NOSDL),1)
LIBS+= -lSDL
endif
# subdirectory for objects # subdirectory for objects
OBJDIR=build OBJDIR=build

20
fbdoom/w_file_stdc_unbuffered.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
@ -92,7 +93,8 @@ size_t W_StdC_Read(wad_file_t *wad, unsigned int offset,
void *buffer, size_t buffer_len) void *buffer, size_t buffer_len)
{ {
stdc_wad_file_t *stdc_wad; stdc_wad_file_t *stdc_wad;
size_t result; size_t result = 0;
int rc;
stdc_wad = (stdc_wad_file_t *) wad; stdc_wad = (stdc_wad_file_t *) wad;
@ -102,7 +104,21 @@ size_t W_StdC_Read(wad_file_t *wad, unsigned int offset,
// Read into the buffer. // Read into the buffer.
result = read(stdc_wad->fd, buffer, buffer_len); do {
rc = read(stdc_wad->fd, (char *)buffer + result, buffer_len - result);
if (rc <= 0) {
if (rc < 0 && errno == EINTR)
continue;
break;
}
result += rc;
} while (result < buffer_len);
return result; return result;
} }