diff -ru2 ../ty1to2.base/src/externs.h src/externs.h --- ../ty1to2.base/src/externs.h Sun Dec 12 15:35:53 2004 +++ src/externs.h Tue Jan 11 02:36:46 2005 @@ -19,9 +19,9 @@ extern void error(char *fmt, ...); -u_long getlong(u_char *buf); -u_short getshort(u_char *buf); +uint16_t get16(u_char *buf); +uint32_t get32(u_char *buf); uint64_t get64(u_char *buf); -void putshort(void *buf, u_short val); -void putlong(void *buf, u_long val); +void put16(void *buf, uint16_t val); +void put32(void *buf, uint32_t val); void put64(u_char *buf, uint64_t val); void dump_pack(u_char *buf, u_int size); diff -ru2 ../ty1to2.base/src/master.c src/master.c --- ../ty1to2.base/src/master.c Sun Dec 12 17:03:09 2004 +++ src/master.c Tue Jan 11 03:07:33 2005 @@ -116,5 +116,5 @@ } if (dbg(3)) { - printf("SEQ at %d:%d Time: %llx\n", chunkcnt, seq, time); + printf("SEQ at %d:%d Time: %llx\n", chunkcnt, seq, (long long)time); } *lastseq = chunkcnt; @@ -153,5 +153,5 @@ printf("Bitmaps: %d Tabidx: %d\n", bitmaps, tabidx); for (i = 0; i < bitmaps; i++) { - printf("Timestamp: %llx ", table[i].stamp); + printf("Timestamp: %llx ", (long long)table[i].stamp); printf("GOP bits: "); for (j = 0; j < TIVO_BITMAPSIZE; j++) { @@ -171,5 +171,5 @@ } } - assert(i); + /* assert(i); */ put64((u_char *)&gop_stamps[i], gop_stamps[i]); write_internal(ofd, (u_char *)&gop_stamps[i], sizeof(tivo_tstamp_t)); @@ -186,11 +186,11 @@ printf("Generating master chunk for %d chunks\n", chunks); } - putlong(&master.magic, MASTER_CHUNK_MAGIC); - putlong(&master.objtype, 2); /* MFS_FILE_STREAM */ - putlong(&master.chunksize, CHUNK_SIZE); - putlong(&master.chunkcnt, chunks*256 + 4); - putlong(&master.unknown, 8); - putlong(&master.bitmapsize, TIVO_BITMAPSIZE); - putlong(&master.timescale, TIVO_TIMESCALE); + put32(&master.magic, MASTER_CHUNK_MAGIC); + put32(&master.objtype, 2); /* MFS_FILE_STREAM */ + put32(&master.chunksize, CHUNK_SIZE); + put32(&master.chunkcnt, chunks*256 + 4); + put32(&master.unknown, 8); + put32(&master.bitmapsize, TIVO_BITMAPSIZE); + put32(&master.timescale, TIVO_TIMESCALE); bitmaps = (chunks + (TIVO_BITSPERREC-1)) / TIVO_BITSPERREC; gopsize = bitmaps*GOP_REC_LEN + sizeof(tivo_tstamp_t); @@ -198,5 +198,5 @@ printf("gopsize: %d\n", gopsize); } - putlong(&master.goptableend, gopsize); + put32(&master.goptableend, gopsize); write_internal(ofd, (char *)&master, sizeof(master)); generate_gop(chunks, ofd, bitmaps); @@ -212,5 +212,5 @@ int stat, size, pos; u_int lastseq, replaced, masteridx, paychunk; - u_long id; + uint32_t id; size = CHUNK_SIZE; @@ -223,5 +223,5 @@ break; } - id = getlong(buf); + id = get32(buf); if (id == MASTER_CHUNK_MAGIC) { if (paychunk) { Only in src: master.o diff -ru2 ../ty1to2.base/src/os.h src/os.h --- ../ty1to2.base/src/os.h Sat Dec 4 12:03:24 2004 +++ src/os.h Tue Jan 11 03:07:58 2005 @@ -23,4 +23,5 @@ #define O_BINARY _O_BINARY #endif +#define OPEN_OS_FLAGS O_BINARY #define GETOPT_REQUIRED #define inline _inline @@ -29,8 +30,10 @@ #define _LARGEFILE64_SOURCE /* Needs to precede inclusion on features.h */ -#ifdef linux +#ifndef OPEN_OS_FLAGS +#ifdef O_LARGEFILE #define OPEN_OS_FLAGS O_LARGEFILE #else -#define OPEN_OS_FLAGS O_BINARY +#define OPEN_OS_FLAGS 0 +#endif #endif Only in src: ty1to2 diff -ru2 ../ty1to2.base/src/ty1to2.c src/ty1to2.c --- ../ty1to2.base/src/ty1to2.c Sun Jan 9 13:28:09 2005 +++ src/ty1to2.c Tue Jan 11 02:36:46 2005 @@ -61,8 +61,8 @@ u_char paybuf[CHUNK_SIZE]; u_char headbuf[CHUNK_RECLEN*CHUNK_REC_INDEX_MAX+4]; - u_short headidx; /* # records already written */ + uint16_t headidx; /* # records already written */ u_int payidx; /* Buffer offset of payload */ boolean have_seq; /* Whether this chunk has seq rec. */ - u_short seqidx; /* record # of seq rec */ + uint16_t seqidx; /* record # of seq rec */ u_int chnk; /* Chunk # */ u_int segchunks; /* Chunk # within FSID segment */ @@ -89,5 +89,5 @@ minor = size & 0xf; size >>= 4; - putshort(buf, size); + put16(buf, size); buf[2] = (minor << 4) | (buf[2] & 0xf); } @@ -97,10 +97,10 @@ */ static int -start_code_search(u_char *buf, u_long search, int start, u_int limit) +start_code_search(u_char *buf, uint32_t search, int start, u_int limit) { u_int prepad, *longbuf; - u_long searchbuf; + uint32_t searchbuf; - putlong((u_char *)&searchbuf, search); + put32((u_char *)&searchbuf, search); for (prepad = start; prepad < limit; prepad++) { longbuf = (u_int *)&buf[prepad]; @@ -120,5 +120,5 @@ static int rewrite_audio(int ofd, u_char *buf, u_char *new, - u_int *added, u_long start_code, u_int size) + u_int *added, uint32_t start_code, u_int size) { u_int paylen, headlen; @@ -157,5 +157,5 @@ pes = &buf[prepad]; pes += sizeof(int); /* Skip sync word */ - paylen = getshort(pes); /* Get old payload len */ + paylen = get16(pes); /* Get old payload len */ if ((size) < paylen) { return 0; @@ -187,5 +187,5 @@ memcpy(new, buf, prepad+4); new += (prepad+4); - putshort(new, paylen); + put16(new, paylen); new += 2; @@ -341,5 +341,5 @@ u_char *buf, u_char *p, int pos, u_int rec, int ofd) { - static u_long start_code = START_CODE_MPEG; + static uint32_t start_code = START_CODE_MPEG; u_int newsize, added; u_char audhead[CHUNK_RECLEN], audpay[CHUNK_SIZE]; @@ -391,8 +391,8 @@ parse_chunk(u_char *buf, u_int chunk, int ofd) { - u_long id; + uint32_t id; u_int size, type, major, offset, i; u_char *p; - u_short recs; + uint16_t recs; boolean is_seq; tivo_tstamp_t time; @@ -400,5 +400,5 @@ static u_int errcnt = 0; - id = getlong(buf); + id = get32(buf); if (id == MASTER_CHUNK_MAGIC) { if (dbg(2)) { @@ -427,5 +427,5 @@ if (dbg(1)) { printf(" Last valid chunk timestamp: %llx" - " This chunk: %llx\n", lasttime, time); + " This chunk: %llx\n", (long long)lasttime, (long long)time); } } @@ -443,5 +443,5 @@ for (i=0; i>4); + size = (get16(p)<<4) | (p[2]>>4); if (size & 0x80000) { /* We have extended data */ @@ -541,5 +541,5 @@ } astream.buf = abuf; - putlong(chunk_skel, MASTER_CHUNK_MAGIC); + put32(chunk_skel, MASTER_CHUNK_MAGIC); memset(&chunk_skel[4], 0, CHUNK_SIZE-4); memset(chunk_blank, 0xff, CHUNK_SIZE); Only in src: ty1to2.o diff -ru2 ../ty1to2.base/src/utils.c src/utils.c --- ../ty1to2.base/src/utils.c Sun Dec 12 16:41:40 2004 +++ src/utils.c Tue Jan 11 02:36:46 2005 @@ -52,8 +52,8 @@ } -u_long -getlong(u_char *buf) +uint32_t +get32(u_char *buf) { - u_long res; + uint32_t res; res = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; @@ -64,18 +64,18 @@ get64(u_char *buf) { - u_long lower; + uint32_t lower; uint64_t res; - res = getlong(buf); - lower = getlong(&buf[4]); + res = get32(buf); + lower = get32(&buf[4]); res = (res << 32) | lower; return res; } -u_short -getshort(u_char *buf) +uint16_t +get16(u_char *buf) { - u_short ret; + uint16_t ret; ret = (buf[0] << 8) | buf[1]; @@ -84,5 +84,5 @@ void -putshort(void *buf, u_short val) +put16(void *buf, uint16_t val) { u_char *cp; @@ -94,5 +94,5 @@ void -putlong(void *buf, u_long val) +put32(void *buf, uint32_t val) { u_char *cp; @@ -168,4 +168,4 @@ min = secs / 60; secs %= 60; - printf("%s%d:%.2d (%llx)%s", head, min, secs, time, trail); + printf("%s%d:%.2d (%llx)%s", head, min, secs, (long long)time, trail); } Only in src: utils.o