summaryrefslogtreecommitdiff
path: root/src/shared/stream.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/stream.cpp')
-rw-r--r--src/shared/stream.cpp102
1 files changed, 28 insertions, 74 deletions
diff --git a/src/shared/stream.cpp b/src/shared/stream.cpp
index f2b586e..888caa8 100644
--- a/src/shared/stream.cpp
+++ b/src/shared/stream.cpp
@@ -214,17 +214,17 @@ size_t encodeutf8(uchar *dstbuf, size_t dstlen, const uchar *srcbuf, size_t srcl
{
if(dst >= dstend) goto done;
const uchar *end = min(srcend, &src[dstend-dst]);
- do
- {
+ do
+ {
if(uni == '\f')
{
if(++src >= srcend) goto done;
goto uni1;
}
- *dst++ = uni;
- if(++src >= end) goto done;
- uni = cube2uni(*src);
- }
+ *dst++ = uni;
+ if(++src >= end) goto done;
+ uni = cube2uni(*src);
+ }
while(uni <= 0x7F);
}
if(uni <= 0x7FF) { if(dst + 2 > dstend) goto done; *dst++ = 0xC0 | (uni>>6); goto uni2; }
@@ -239,7 +239,7 @@ size_t encodeutf8(uchar *dstbuf, size_t dstlen, const uchar *srcbuf, size_t srcl
uni3: *dst++ = 0x80 | ((uni>>6)&0x3F);
uni2: *dst++ = 0x80 | (uni&0x3F);
uni1:;
- }
+ }
while(++src < srcend);
done:
@@ -437,7 +437,7 @@ const char *addpackagedir(const char *dir)
if(!filter) break;
if(filter > pdir && filter[-1] == PATHDIV && filter[len] == PATHDIV) break;
filter += len;
- }
+ }
packagedir &pf = packagedirs.add();
pf.dir = filter ? newstring(pdir, filter-pdir) : newstring(pdir);
pf.dirlen = filter ? filter-pdir : strlen(pdir);
@@ -493,9 +493,9 @@ bool listdir(const char *dirname, bool rel, const char *ext, vector<char *> &fil
if(!ext) files.add(newstring(FindFileData.cFileName));
else
{
- size_t namelen = strlen(FindFileData.cFileName);
- if(namelen > extsize)
- {
+ size_t namelen = strlen(FindFileData.cFileName);
+ if(namelen > extsize)
+ {
namelen -= extsize;
if(FindFileData.cFileName[namelen] == '.' && strncmp(FindFileData.cFileName+namelen+1, ext, extsize-1)==0)
files.add(newstring(FindFileData.cFileName, namelen));
@@ -623,14 +623,6 @@ size_t stream::printf(const char *fmt, ...)
char buf[512];
char *str = buf;
va_list args;
-#if defined(WIN32) && !defined(__GNUC__)
- va_start(args, fmt);
- int len = _vscprintf(fmt, args);
- if(len <= 0) { va_end(args); return 0; }
- if(len >= (int)sizeof(buf)) str = new char[len+1];
- _vsnprintf(str, len+1, fmt, args);
- va_end(args);
-#else
va_start(args, fmt);
int len = vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
@@ -642,7 +634,6 @@ size_t stream::printf(const char *fmt, ...)
vsnprintf(str, len+1, fmt, args);
va_end(args);
}
-#endif
size_t n = write(str, len);
if(str != buf) delete[] str;
return n;
@@ -665,11 +656,7 @@ struct filestream : stream
bool opentemp(const char *name, const char *mode)
{
if(file) return false;
-#ifdef WIN32
- file = fopen(name, mode);
-#else
file = tmpfile();
-#endif
return file!=NULL;
}
@@ -679,31 +666,14 @@ struct filestream : stream
}
bool end() { return feof(file)!=0; }
- offset tell()
- {
-#ifdef WIN32
-#if defined(__GNUC__) && !defined(__MINGW32__)
- offset off = ftello64(file);
-#else
- offset off = _ftelli64(file);
-#endif
-#else
+ offset tell()
+ {
offset off = ftello(file);
-#endif
- // ftello returns LONG_MAX for directories on some platforms
return off + 1 >= 0 ? off : -1;
}
- bool seek(offset pos, int whence)
- {
-#ifdef WIN32
-#if defined(__GNUC__) && !defined(__MINGW32__)
- return fseeko64(file, pos, whence) >= 0;
-#else
- return _fseeki64(file, pos, whence) >= 0;
-#endif
-#else
+ bool seek(offset pos, int whence = SEEK_SET)
+ {
return fseeko(file, pos, whence) >= 0;
-#endif
}
size_t read(void *buf, size_t len) { return fread(buf, 1, len, file); }
@@ -724,10 +694,6 @@ struct filestream : stream
}
};
-#ifndef STANDALONE
-VAR(dbggz, 0, 0, 1);
-#endif
-
struct gzstream : stream
{
enum
@@ -858,18 +824,6 @@ struct gzstream : stream
void finishreading()
{
if(!reading) return;
-#ifndef STANDALONE
- if(dbggz)
- {
- uint checkcrc = 0, checksize = 0;
- loopi(4) checkcrc |= uint(readbyte()) << (i*8);
- loopi(4) checksize |= uint(readbyte()) << (i*8);
- if(checkcrc != crc)
- conoutf(CON_DEBUG, "gzip crc check failed: read %X, calculated %X", checkcrc, crc);
- if(checksize != zfile.total_out)
- conoutf(CON_DEBUG, "gzip size check failed: read %u, calculated %u", checksize, uint(zfile.total_out));
- }
-#endif
}
void stopreading()
@@ -1031,7 +985,7 @@ struct utf8stream : stream
offset pos;
size_t bufread, bufcarry, buflen;
bool reading, writing, autoclose;
- uchar buf[BUFSIZE];
+ uchar buf[BUFSIZE];
utf8stream() : file(NULL), pos(0), bufread(0), bufcarry(0), buflen(0), reading(false), writing(false), autoclose(false)
{
@@ -1058,10 +1012,10 @@ struct utf8stream : stream
{
size_t n = file->read(buf, 3);
if(n == 3 && buf[0] == 0xEF && buf[1] == 0xBB && buf[2] == 0xBF) return true;
- buflen = n;
+ buflen = n;
return false;
}
-
+
bool open(stream *f, const char *mode, bool needclose)
{
if(file) return false;
@@ -1071,16 +1025,16 @@ struct utf8stream : stream
else if(*mode=='w') { writing = true; break; }
}
if(!reading && !writing) return false;
-
+
file = f;
-
+
if(reading) checkheader();
-
+
autoclose = needclose;
return true;
- }
+ }
- void finishreading()
+ void finishreading()
{
if(!reading) return;
}
@@ -1118,14 +1072,14 @@ struct utf8stream : stream
return !off;
}
else if(whence == SEEK_CUR) off += pos;
-
+
if(off >= pos) off -= pos;
else if(off < 0 || !file->seek(0, SEEK_SET)) return false;
else
{
bufread = bufcarry = buflen = 0;
pos = 0;
- checkheader();
+ checkheader();
}
uchar skip[512];
@@ -1135,7 +1089,7 @@ struct utf8stream : stream
if(read(skip, skipped) != skipped) { stopreading(); return false; }
off -= skipped;
}
-
+
return true;
}
@@ -1165,7 +1119,7 @@ struct utf8stream : stream
if(bufread >= bufcarry) { if(readbuf(BUFSIZE)) continue; stopreading(); if(!next) return false; break; }
size_t n = min(len - next, bufcarry - bufread);
uchar *endline = (uchar *)memchr(&buf[bufread], '\n', n);
- if(endline) { n = endline+1 - &buf[bufread]; len = next + n; }
+ if(endline) { n = endline+1 - &buf[bufread]; len = next + n; }
memcpy(&((uchar *)dst)[next], &buf[bufread], n);
next += n;
bufread += n;
@@ -1252,7 +1206,7 @@ char *loadfile(const char *fn, size_t *size, bool utf8)
if(f->read(buf, 3) != 3) { delete f; delete[] buf; return NULL; }
if(((uchar *)buf)[0] == 0xEF && ((uchar *)buf)[1] == 0xBB && ((uchar *)buf)[2] == 0xBF) len -= 3;
else offset += 3;
- }
+ }
size_t rlen = f->read(&buf[offset], len-offset);
delete f;
if(rlen != len-offset) { delete[] buf; return NULL; }
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-21 06:21:59 +0000