X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fos.c;h=a4142ff04e051750eebb14778fa6621fd2638d5d;hp=3370d513782af1193804e6e74f7c6c5df0d9d5f2;hb=8589e0d1f5e47c05458033e750fd6182ca704fbe;hpb=21f2e59a76b5493cfb9284945777d7c4ffe310a5 diff --git a/lib/os.c b/lib/os.c index 3370d51..a4142ff 100755 --- a/lib/os.c +++ b/lib/os.c @@ -26,14 +26,32 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #ifdef WIN32 #include +#else +#include +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#else +#undef HAVE_STAT +#endif +#ifdef HAVE_SYS_MMAN_H +#include +#else +#undef HAVE_MMAP +#endif +#ifdef HAVE_SYS_TYPES_H +#include +#else +#undef HAVE_STAT #endif #if defined(CYGWIN) -static char seperator = '/'; +char path_seperator = '/'; #elif defined(WIN32) -static char seperator = '\\'; +char path_seperator = '\\'; #else -static char seperator = '/'; +char path_seperator = '/'; #endif #ifdef WIN32 @@ -46,25 +64,25 @@ char* getRegistryEntry(char*path) DWORD type; char*buf; rc = RegOpenKeyEx(HKEY_CURRENT_USER, path, 0, KEY_ALL_ACCESS, &key); - if(rc != ERROR_SUCCESS) + if(rc) rc = RegOpenKeyEx(HKEY_CURRENT_USER, path, 0, KEY_READ, &key); - if(rc != ERROR_SUCCESS) + if(rc) rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, path, 0, KEY_ALL_ACCESS, &key); - if(rc != ERROR_SUCCESS) + if(rc) rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, path, 0, KEY_READ, &key); - if (rc != ERROR_SUCCESS) { + if (rc) { fprintf(stderr, "RegOpenKeyEx failed\n"); return 0; } rc = RegQueryValueEx(key, NULL, 0, 0, 0, (LPDWORD)&size) ; - if(rc != ERROR_SUCCESS) { + if(rc) { fprintf(stderr, "RegQueryValueEx(1) failed: %d\n", rc); return 0; } buf = (char*)malloc(size+1); rc = RegQueryValueEx(key, NULL, 0, &type, (BYTE*)buf, (LPDWORD)&size); - if(rc != ERROR_SUCCESS) { + if(rc) { fprintf(stderr, "RegQueryValueEx(2) failed: %d\n", rc); return 0; } @@ -77,6 +95,7 @@ char* getRegistryEntry(char*path) } else if(type == REG_BINARY) { return buf; } + return 0; } int setRegistryEntry(char*key,char*value) @@ -86,15 +105,15 @@ int setRegistryEntry(char*key,char*value) int ret1 = 0, ret2=0; ret1 = RegCreateKey(HKEY_CURRENT_USER, key, &hkey1); ret2 = RegCreateKey(HKEY_LOCAL_MACHINE, key, &hkey2); - if(ret1 != ERROR_SUCCESS && ret2 != ERROR_SUCESS) { + if(ret1 && ret2) { fprintf(stderr, "registry: CreateKey %s failed\n", key); return 0; } - if(ret1==ERROR_SUCCESS) + if(!ret1) ret1 = RegSetValue(hkey1, NULL, REG_SZ, value, strlen(value)+1); - if(ret2==ERROR_SUCCESS) + if(!ret2) ret2 = RegSetValue(hkey2, NULL, REG_SZ, value, strlen(value)+1); - if(ret1 != ERROR_SUCCESS && ret2 != ERROR_SUCCESS) { + if(ret1 && ret2) { fprintf(stderr, "registry: SetValue %s failed\n", key); return 0; } @@ -127,14 +146,14 @@ char* concatPaths(const char*base, const char*add) int l2 = strlen(add); int pos = 0; char*n = 0; - while(l1 && base[l1-1] == seperator) + while(l1 && base[l1-1] == path_seperator) l1--; - while(pos < l2 && add[pos] == seperator) + while(pos < l2 && add[pos] == path_seperator) pos++; n = (char*)malloc(l1 + (l2-pos) + 2); memcpy(n,base,l1); - n[l1]=seperator; + n[l1]=path_seperator; strcpy(&n[l1+1],&add[pos]); return n; } @@ -173,8 +192,8 @@ static char* getTempDir() return dir; } -char* mktempname(char*ptr) { - static char tmpbuf[128]; +char* mktempname(char*ptr, const char*ext) { + static char tmpbuf[160]; char*dir = getTempDir(); int l = strlen(dir); char*sep = ""; @@ -188,19 +207,104 @@ char* mktempname(char*ptr) { #endif } - // used to be mktemp. This does remove the warnings, but - // It's not exactly an improvement. #ifdef HAVE_LRAND48 - sprintf(ptr, "%s%s%08x%08x",dir,sep,lrand48(),lrand48()); + unsigned int r1 = (unsigned int)lrand48(); + unsigned int r2 = (unsigned int)lrand48(); +#elif HAVE_RAND + unsigned int r1 = rand(); + unsigned int r2 = rand(); #else -# ifdef HAVE_RAND - sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand()); -# else - static int count = 1; - sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count); - count ++; -# endif + static int count = 1; + unsigned int r1 = time(0); + unsigned int r2 = (unsigned int)tmpbuf<<8^count; + count ++; #endif - return ptr; + if(ext) { + sprintf(ptr, "%s%s%04x%04x.%s",dir,sep,r1,r2,ext); + } else { + sprintf(ptr, "%s%s%04x%04x",dir,sep,r1,r2); + } + return ptr; +} + +memfile_t* memfile_open(const char*path) +{ + memfile_t*file = malloc(sizeof(memfile_t)); +#if defined(HAVE_MMAP) && defined(HAVE_STAT) + int fi = open(path, O_RDONLY); + if(fi<0) { + perror(path); + free(file); + return 0; + } + struct stat sb; + if(fstat(fi, &sb)<0) { + perror(path); + return 0; + } + file->len = sb.st_size; + file->data = mmap(0, sb.st_size, PROT_READ, MAP_PRIVATE, fi, 0); +#else + FILE*fi = fopen(path, "rb"); + if(!fi) { + perror(path); + free(file); + return 0; + } + fseek(fi, 0, SEEK_END); + file->len = ftell(fi); + fseek(fi, 0, SEEK_SET); + file->data = malloc(file->len); + if(!file->data) { + fprintf(stderr, "Out of memory while allocating memory for file %s\n", path); + free(file); + return 0; + } + fread(file->data, file->len, 1, fi); + fclose(fi); +#endif + return file; +} + +void memfile_close(memfile_t*file) +{ +#if defined(HAVE_MMAP) && defined(HAVE_STAT) + munmap(file->data, file->len); +#else + free(file->data); +#endif + file->data = 0; + file->len = 0; + free(file); +} + +void move_file(const char*from, const char*to) +{ + int result = rename(from, to); + + if(result==0) return; //done! + + /* if we can't rename, for some reason, copy the file + manually */ + FILE*fi = fopen(from, "rb"); + if(!fi) { + perror(from); + return; + } + FILE*fo = fopen(to, "wb"); + if(!fo) { + perror(to); + return; + } + char buffer[16384]; + while(1) { + int bytes = fread(buffer, 16384, 1, fi); + if(bytes<=0) + return; + fwrite(buffer, bytes, 1, fo); + } + + fclose(fo); + fclose(fi); }