ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Urlader/urlader.c
(Generate patch)

Comparing Urlader/urlader.c (file contents):
Revision 1.3 by root, Thu Dec 29 10:39:34 2011 UTC vs.
Revision 1.6 by root, Fri Dec 30 12:21:28 2011 UTC

1#ifndef URLADER 1#ifndef URLADER
2# define URLADER "urlader" 2# define URLADER "urlader"
3#endif 3#endif
4#define URLADER_VERSION "1.0" 4#define URLADER_VERSION "1.0" // a decimal number, not a version string
5
6#define MAX_ARGC 32
7#define MAX_ARGS 256
5 8
6#include <stdio.h> 9#include <stdio.h>
7#include <stdlib.h> 10#include <stdlib.h>
8#include <unistd.h> 11#include <unistd.h>
9#include <errno.h> 12#include <errno.h>
… …
15 18
16#define TAIL_MAGIC "SCHMORPPACK0" 19#define TAIL_MAGIC "SCHMORPPACK0"
17 20
18#ifdef _WIN32 21#ifdef _WIN32
19 22
20 #include <windows.h> 23 #include <windows.h>
21 //#include <winbase.h> 24 //#include <winbase.h>
22 #include <shlobj.h> 25 #include <shlobj.h>
23 #include <shlwapi.h> 26 #include <shlwapi.h>
24 #include <wininet.h> 27 #include <wininet.h>
25 28
26 static DWORD dword; 29 static DWORD dword;
27 30
28 #define u_handle HANDLE 31 #define u_handle HANDLE
32 #define u_invalid_handle 0
33 #define u_valid(handle) (!!handle)
34
29 #define u_setenv(name,value) SetEnvironmentVariable (name, value) 35 #define u_setenv(name,value) SetEnvironmentVariable (name, value)
30 #define u_mkdir(path) !CreateDirectory (path, NULL) 36 #define u_mkdir(path) !CreateDirectory (path, NULL)
31 #define u_chdir(path) !SetCurrentDirectory (path) 37 #define u_chdir(path) !SetCurrentDirectory (path)
32 #define u_rename(fr,to) !MoveFile (fr, to) 38 #define u_rename(fr,to) !MoveFile (fr, to)
33 #define u_open(path) CreateFile (path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL) 39 #define u_open(path) CreateFile (path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
34 #define u_creat(path,exec) CreateFile (path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL) 40 #define u_creat(path,exec) CreateFile (path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
41 #define u_creat(path,exec) CreateFile (path, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL)
35 #define u_close(handle) CloseHandle (handle) 42 #define u_close(handle) CloseHandle (handle)
36 #define u_append(path,add) PathAppend (path, add) 43 #define u_append(path,add) PathAppend (path, add)
37 #define u_write(handle,data,len) (WriteFile (handle, data, len, &dword, 0) ? dword : -1) 44 #define u_write(handle,data,len) (WriteFile (handle, data, len, &dword, 0) ? dword : -1)
38 #define u_sync() // use transacted I/O?
39 45
40#else 46 #define u_fsync(handle) FlushFileBuffers (handle)
47 #define u_sync()
41 48
49 #define u_lockfile(path) CreateFile (path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL)
50 #define u_cloexec(handle)
51 // acquire shared in addition to excl, then unlock excl
52 #define u_lock_write_to_read(wait) u_lock (U_LOCK_READ, 1); u_lock (U_UNLOCK, 1);
53
54#else
55
56 #define _GNU_SOURCE 1
57 #define _BSD_SOURCE 1
58 // the above increases our chances of getting MAP_ANONYMOUS
59
42 #include <sys/mman.h> 60 #include <sys/mman.h>
43 #include <sys/types.h> 61 #include <sys/types.h>
44 #include <pwd.h> 62 #include <pwd.h>
45 63
64 #if defined (MAP_ANON) && !defined (MAP_ANONYMOUS)
65 #define MAP_ANONYMOUS MAP_ANON
66 #endif
67
46 #ifdef PATH_MAX 68 #ifdef PATH_MAX
47 #define MAX_PATH (PATH_MAX < 4096 ? 4096 : PATH_MAX) 69 #define MAX_PATH (PATH_MAX < 4096 ? 4096 : PATH_MAX)
48 #else 70 #else
49 #define MAX_PATH 4096 71 #define MAX_PATH 4096
50 #endif 72 #endif
51 73
52 #define u_handle int 74 #define u_handle int
75 #define u_invalid_handle -1
76 #define u_valid(fd) ((fd) >= 0)
77
53 #define u_setenv(name,value) setenv (name, value, 1) 78 #define u_setenv(name,value) setenv (name, value, 1)
54 #define u_mkdir(path) mkdir (path, 0777) 79 #define u_mkdir(path) mkdir (path, 0777)
55 #define u_chdir(path) chdir (path) 80 #define u_chdir(path) chdir (path)
56 #define u_rename(fr,to) rename (fr, to) 81 #define u_rename(fr,to) rename (fr, to)
57 #define u_open(path) open (path, O_RDONLY) + 1 82 #define u_open(path) open (path, O_RDONLY)
58 #define u_creat(path,exec) open (path, O_WRONLY | O_CREAT | O_TRUNC, (exec) ? 0777 : 0666) + 1 83 #define u_creat(path,exec) open (path, O_WRONLY | O_CREAT | O_TRUNC, (exec) ? 0777 : 0666)
59 #define u_close(handle) close (handle - 1) 84 #define u_close(handle) close (handle)
60 #define u_append(path,add) strcat (strcat (path, "/"), add) 85 #define u_append(path,add) strcat (strcat (path, "/"), add)
61 #define u_write(handle,data,len) write ((handle) - 1, data, len) 86 #define u_write(handle,data,len) write (handle, data, len)
87
88 // on a mostly idle system, a sync at the end is certainly faster, hope for the best
89 #define u_fsync(handle)
62 #define u_sync() sync () 90 #define u_sync() sync ()
91
92 #define u_lockfile(path) open (path, O_RDWR | O_CREAT, 0666)
93 #define u_cloexec(handle) fcntl (handle, F_SETFD, FD_CLOEXEC)
94 #define u_lock_write_to_read(wait) u_lock (U_LOCK_READ, 1);
63 95
64#endif 96#endif
65 97
66#define u_16(ptr) (((ptr)[0] << 8) | (ptr)[1]) 98#define u_16(ptr) (((ptr)[0] << 8) | (ptr)[1])
67#define u_32(ptr) (((ptr)[0] << 24) | ((ptr)[1] << 16) | ((ptr)[2] << 8) | (ptr)[3]) 99#define u_32(ptr) (((ptr)[0] << 24) | ((ptr)[1] << 16) | ((ptr)[2] << 8) | (ptr)[3])
68 100
101/* some simple? dynamic memory management for paths might save ltos of ram */
69static u_handle pack_handle; 102static u_handle pack_handle;
103static u_handle lock_handle;
70static char tmppath[MAX_PATH]; 104static char tmppath[MAX_PATH];
71static char currdir[MAX_PATH]; 105static char currdir[MAX_PATH];
72static char datadir[MAX_PATH]; // %AppData%/urlader 106static char datadir[MAX_PATH]; // %AppData%/urlader
73static char exe_dir[MAX_PATH]; // %AppData%/urlader/EXE_ID 107static char exe_dir[MAX_PATH]; // %AppData%/urlader/EXE_ID
74static char execdir[MAX_PATH]; // %AppData%/urlader/EXE_ID/EXE_VER 108static char execdir[MAX_PATH]; // %AppData%/urlader/EXE_ID/EXE_VER
75static char exe_id[MAX_PATH]; 109static char exe_id[MAX_PATH];
76static char exe_ver[MAX_PATH]; 110static char exe_ver[MAX_PATH];
77 111
78static int exe_argc; 112static int exe_argc;
79static const char *exe_argv[32]; 113static const char *exe_argv[MAX_ARGC];
114static char exe_args[MAX_ARGS]; /* actual arguments strings copied here */
115static unsigned int exe_argo;
80 116
81static void 117static void
82fatal (const char *msg) 118fatal (const char *msg)
83{ 119{
84#ifdef _WIN32 120#ifdef _WIN32
85 MessageBox (0, msg, URLADER, 0); 121 MessageBox (0, msg, URLADER, 0);
86#else 122#else
87 fprintf (stderr, "%s: %s\n", URLADER, msg); 123 write (2, URLADER ": ", sizeof (URLADER ": ") - 1);
124 write (2, msg, strlen (msg));
125 write (2, "\n", 1);
88#endif 126#endif
89 127
90 _exit (1); 128 _exit (1);
129}
130
131static void *
132u_malloc (unsigned int size)
133{
134 void *addr;
135
136#ifdef _WIN32
137 HANDLE handle = CreateFileMapping (0, 0, PAGE_READWRITE, 0, size, NULL);
138
139 if (!handle)
140 return 0;
141
142 addr = MapViewOfFile (handle, FILE_MAP_WRITE, 0, 0, size);
143
144 CloseHandle (handle);
145#elif defined (MAP_ANONYMOUS)
146 addr = mmap (0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
147
148 if (addr == (void *)-1)
149 addr = 0;
150#else
151 addr = malloc (size);
152#endif
153
154 return addr;
155}
156
157static void
158u_free (void *addr, unsigned int size)
159{
160#ifdef _WIN32
161 UnmapViewOfFile (addr);
162#elif defined (MAP_ANONYMOUS)
163 munmap (addr, size);
164#else
165 free (addr);
166#endif
167}
168
169static void *
170u_mmap (u_handle h, unsigned int size)
171{
172 void *addr;
173
174#ifdef _WIN32
175 HANDLE handle = CreateFileMapping (h, 0, PAGE_READONLY, 0, size, NULL);
176
177 if (!handle)
178 return 0;
179
180 addr = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, size);
181
182 CloseHandle (handle);
183#else
184 addr = mmap (0, size, PROT_READ, MAP_SHARED, h, 0);
185
186 if (addr == (void *)-1)
187 addr = 0;
188#endif
189
190 return addr;
191}
192
193static void
194u_munmap (void *addr, unsigned int len)
195{
196#ifdef _WIN32
197 UnmapViewOfFile (addr);
198#else
199 munmap (addr, len);
200#endif
91} 201}
92 202
93static void 203static void
94tmpdir (const char *dir) 204tmpdir (const char *dir)
95{ 205{
… …
106 if (!u_mkdir (tmppath)) 216 if (!u_mkdir (tmppath))
107 return; 217 return;
108 } 218 }
109} 219}
110 220
221enum
222{
223 U_UNLOCK,
224 U_LOCK_READ,
225 U_LOCK_WRITE
226};
227
111static void 228static int
229u_lock (int mode, int dowait)
230{
231#ifdef _WIN32
232 if (mode == U_UNLOCK)
233 return !UnlockFile (lock_handle, 0, 0, 1, 0);
234 else
235 {
236 OVERLAPPED ov = { 0 };
237
238 return !LockFileEx (lock_handle,
239 0
240 | (mode == U_LOCK_WRITE ? LOCKFILE_EXCLUSIVE_LOCK : 0)
241 | (dowait ? 0 : LOCKFILE_FAIL_IMMEDIATELY),
242 0,
243 1, 0,
244 &ov);
245 }
246#else
247 static short mode2lck [] = { F_UNLCK, F_RDLCK, F_WRLCK };
248 struct flock lck;
249 lck.l_type = mode2lck [mode];
250 lck.l_whence = SEEK_SET;
251 lck.l_start = 0;
252 lck.l_len = 1;
253
254 return fcntl (lock_handle, dowait ? F_SETLKW : F_SETLK, &lck);
255#endif
256}
257
258static void
112systemv (const char *const argv[], int dowait) 259systemv (const char *const argv[])
113{ 260{
114#ifdef _WIN32 261#ifdef _WIN32
115 _spawnv (P_WAIT, argv [0], argv); 262 _spawnv (P_WAIT, argv [0], argv);
116#else 263#else
117 pid_t pid = dowait ? fork () : 0; 264 pid_t pid = fork ();
118 265
119 if (pid < 0) 266 if (pid < 0)
120 fatal ("fork failure"); 267 fatal ("fork failure");
121 268
122 if (!pid) 269 if (!pid)
… …
138 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 }; 285 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 };
139 sprintf (buf, "\"%s\"", path); 286 sprintf (buf, "\"%s\"", path);
140 #else 287 #else
141 const char *argv[] = { "/bin/rm", "-rf", path, 0 }; 288 const char *argv[] = { "/bin/rm", "-rf", path, 0 };
142 #endif 289 #endif
143 systemv (argv, 1); 290 systemv (argv);
144} 291}
145 292
146enum 293enum
147{ 294{
148 T_NULL, // 5 295 T_NULL, // 5
149 T_META, // 1 : exe_id, exe_ver 296 T_META, // 1 : exe_id, exe_ver
150 T_ARG, // 2 : arg
151 T_ENV, // 3 : name, value 297 T_ENV, // 2 : name, value
298 T_ARG, // 3 : arg
152 T_DIR, // 4+: path 299 T_DIR, // 4+: path
153 T_FILE, // 4+: path, data 300 T_FILE, // 4+: path, data
154 T_NUM 301 T_NUM
155}; 302};
156 303
… …
176}; 323};
177 324
178static char *pack_base, *pack_end; 325static char *pack_base, *pack_end;
179static struct hdr *pack_cur; 326static struct hdr *pack_cur;
180static char *scratch; 327static char *scratch;
181static unsigned int scratch_len; 328static unsigned int scratch_size;
182 329
183#define PACK_NAME ((char *)(pack_cur + 1)) 330#define PACK_NAME ((char *)(pack_cur + 1))
184#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1) 331#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1)
185#define PACK_VALID pack_cur->type 332#define PACK_VALID pack_cur->type
186 333
… …
193} 340}
194 341
195static void 342static void
196pack_unmap (void) 343pack_unmap (void)
197{ 344{
198 if (!pack_base) 345 if (pack_base)
199 return; 346 {
200
201 free (scratch);
202
203#ifdef _WIN32
204 UnmapViewOfFile (pack_base);
205#else
206 munmap (pack_base, pack_end - pack_base); 347 u_munmap (pack_base, pack_end - pack_base);
207#endif 348 pack_base = 0;
349 }
350
351 if (scratch)
352 {
353 u_free (scratch, scratch_size);
354 scratch = 0;
355 }
208} 356}
209 357
210static int 358static int
211pack_map (void) 359pack_map (void)
212{ 360{
361 char *addr;
362 unsigned int size;
363
213#ifdef _WIN32 364#ifdef _WIN32
214 BY_HANDLE_FILE_INFORMATION fi; 365 BY_HANDLE_FILE_INFORMATION fi;
215 366
216 if (!GetFileInformationByHandle (pack_handle, &fi)) 367 if (!GetFileInformationByHandle (pack_handle, &fi))
217 return 0; 368 return 0;
218 369
219 if (fi.nFileSizeHigh) // too big 370 size = fi.nFileSizeLow;
371#else
372 size = lseek (pack_handle, 0, SEEK_END);
373#endif
374
375 addr = u_mmap (pack_handle, size);
376 if (!addr)
220 return 0; 377 return 0;
221 378
222 HANDLE handle = CreateFileMapping (pack_handle, 0, PAGE_READONLY, 0, fi.nFileSizeLow, NULL);
223
224 if (!handle)
225 return 0;
226
227 pack_unmap (); 379 pack_unmap ();
228 380
229 pack_base = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, fi.nFileSizeLow);
230
231 CloseHandle (handle);
232
233 pack_end = pack_base + fi.nFileSizeLow;
234#else
235 off_t len = lseek (pack_handle - 1, 0, SEEK_END);
236
237 pack_unmap ();
238
239 pack_base = mmap (0, len, PROT_READ, MAP_SHARED, pack_handle - 1, 0);
240 if (pack_base == (void *)-1)
241 pack_base = 0; 381 pack_base = addr;
242
243 pack_end = pack_base + len; 382 pack_end = pack_base + size;
244#endif
245
246 if (!pack_base)
247 return 0;
248 383
249 struct tail *tail; 384 struct tail *tail;
250 385
251 tail = (void *)(pack_end - sizeof (*tail)); 386 tail = (void *)(pack_end - sizeof (*tail));
252 387
253 if (memcmp (tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1)) 388 if (memcmp (tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1))
254 return 0; 389 return 0;
255 390
256 pack_cur = (struct hdr *)(pack_end - u_32 (tail->size)); 391 pack_cur = (struct hdr *)(pack_end - u_32 (tail->size));
257 392
258 free (scratch);
259 scratch = malloc (scratch_len = u_32 (tail->max_filesize)); 393 scratch = u_malloc (scratch_size = u_32 (tail->max_filesize));
394 if (!scratch)
395 return 0;
260 396
261 return 1; 397 return 1;
262} 398}
263 399
264static void 400static void
… …
284 420
285 if (u_chdir (exe_dir)) 421 if (u_chdir (exe_dir))
286 fatal ("unable to change to application data directory"); 422 fatal ("unable to change to application data directory");
287 423
288 u_handle h = u_open ("override"); 424 u_handle h = u_open ("override");
289 if (h) 425 if (u_valid (h))
290 { 426 {
291 u_handle oh = pack_handle; 427 u_handle oh = pack_handle;
292 428
293 pack_handle = h; 429 pack_handle = h;
294 if (!pack_map ()) 430 if (!pack_map ())
… …
304 fatal ("unable to locate override metadata"); 440 fatal ("unable to locate override metadata");
305 441
306 strcpy (exe_ver, PACK_DATA); 442 strcpy (exe_ver, PACK_DATA);
307 pack_next (); 443 pack_next ();
308 444
445 for (;;)
446 {
447 if (pack_cur->type == T_ENV)
448 u_setenv (PACK_NAME, PACK_DATA);
309 while (pack_cur->type == T_ARG) 449 else if (pack_cur->type == T_ARG)
310 { 450 {
311 exe_argv [exe_argc++] = strdup (PACK_NAME); 451 int len = u_16 (pack_cur->namelen) + 1;
452 exe_argv [exe_argc++] = exe_args + exe_argo;
453 memcpy (exe_args + exe_argo, PACK_NAME, len);
454 exe_argo += len;
455 }
456 else
457 break;
458
312 pack_next (); 459 pack_next ();
313 } 460 }
314 461
315 while (pack_cur->type == T_ENV) 462done_env_arg:
316 {
317 u_setenv (PACK_NAME, PACK_DATA);
318 pack_next ();
319 }
320
321 strcpy (execdir, exe_dir); 463 strcpy (execdir, exe_dir);
322 u_append (execdir, "i-"); 464 u_append (execdir, "i-");
323 strcat (execdir, exe_ver); 465 strcat (execdir, exe_ver);
466
467 strcat (strcpy (tmppath, execdir), ".lck");
468 lock_handle = u_lockfile (tmppath);
469 if (!lock_handle)
470 fatal ("unable to create lock file");
471
472 u_cloexec (lock_handle);
473
474 // all users that uee an instance acquire a shared lock
475 // acquiring an exclusive lock is enough to delete the dir
476 // deleeting the lockfile is another topic altogether
477 u_lock (U_LOCK_READ, 1);
324 478
325 if (access (execdir, F_OK)) 479 if (access (execdir, F_OK))
326 { 480 {
327 // does not exist yet, so unpack and move 481 // does not exist yet, so unpack and move
328 tmpdir (exe_dir); 482 tmpdir (exe_dir);
… …
343 u_handle h = u_creat (PACK_NAME, pack_cur->flags & F_EXEC); 497 u_handle h = u_creat (PACK_NAME, pack_cur->flags & F_EXEC);
344 unsigned int dlen, len = u_32 (pack_cur->datalen); 498 unsigned int dlen, len = u_32 (pack_cur->datalen);
345 char *data = PACK_DATA; 499 char *data = PACK_DATA;
346 500
347 if (pack_cur->flags & F_LZF) 501 if (pack_cur->flags & F_LZF)
348 if (dlen = lzf_decompress (data, len, scratch, scratch_len)) 502 if (dlen = lzf_decompress (data, len, scratch, scratch_size))
349 { 503 {
350 data = scratch; 504 data = scratch;
351 len = dlen; 505 len = dlen;
352 } 506 }
353 else 507 else
354 fatal ("unable to uncompress file data - pack corrupted?"); 508 fatal ("unable to uncompress file data - pack corrupted?");
355 509
356 if (!h) 510 if (!u_valid (h))
357 fatal ("unable to unpack file from packfile - disk full?"); 511 fatal ("unable to unpack file from packfile - disk full?");
358 512
359 if (u_write (h, data, len) != len) 513 if (u_write (h, data, len) != len)
360 fatal ("unable to unpack file from packfile - disk full?"); 514 fatal ("unable to unpack file from packfile - disk full?");
361 515
516 u_fsync (h);
362 u_close (h); 517 u_close (h);
363 } 518 }
364 break; 519 break;
365 520
366 case T_NULL: 521 case T_NULL:
… …
391 u_setenv ("URLADER_EXECDIR", execdir); 546 u_setenv ("URLADER_EXECDIR", execdir);
392 u_setenv ("URLADER_EXE_ID" , exe_id); 547 u_setenv ("URLADER_EXE_ID" , exe_id);
393 u_setenv ("URLADER_EXE_DIR", exe_dir); 548 u_setenv ("URLADER_EXE_DIR", exe_dir);
394 u_setenv ("URLADER_EXE_VER", exe_ver); 549 u_setenv ("URLADER_EXE_VER", exe_ver);
395 550
551#if 0
396 // yes, this is overkill 552 // yes, this is overkill
397 u_setenv ("SHLIB_PATH" , execdir); // hpux 553 u_setenv ("SHLIB_PATH" , execdir); // hpux
398 u_setenv ("LIBPATH" , execdir); // aix 554 u_setenv ("LIBPATH" , execdir); // aix
399 u_setenv ("LD_LIBRARY_PATH" , execdir); // most elf systems 555 u_setenv ("LD_LIBRARY_PATH" , execdir); // most elf systems
400 u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris 556 u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris
401 u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris 557 u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris
402 u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix 558 u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix
403 u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix 559 u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix
404 u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple 560 u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple
561#endif
405} 562}
406 563
407static void 564static void
408execute (void) 565execute (void)
409{ 566{
410 exe_argv [exe_argc] = 0; 567 exe_argv [exe_argc] = 0;
411 systemv (exe_argv, 0); 568 systemv (exe_argv);
412} 569}
413 570
414#ifdef _WIN32 571#ifdef _WIN32
415 572
416int APIENTRY 573int APIENTRY
417WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show) 574WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show)
418{ 575{
419 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath))) 576 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath)))
420 fatal ("unable to find executable pack"); 577 fatal ("unable to find executable pack");
421 578
422 if (!(pack_handle = u_open (tmppath))) 579 pack_handle = u_open (tmppath);
580 if (!u_valid (pack_handle))
423 fatal ("unable to open executable pack"); 581 fatal ("unable to open executable pack");
424 582
425 exe_info (); 583 exe_info ();
426 584
427 if (!GetCurrentDirectory (sizeof (currdir), currdir)) 585 if (!GetCurrentDirectory (sizeof (currdir), currdir))
… …
444int 602int
445main (int argc, char *argv[]) 603main (int argc, char *argv[])
446{ 604{
447 char *home = getenv ("HOME"); 605 char *home = getenv ("HOME");
448 606
449 // we assume fd 0 and 2 are "normal"
450
451 if (!(pack_handle = u_open (argv [0]))) 607 pack_handle = u_open (argv [0]);
608 if (!u_valid (pack_handle))
452 fatal ("unable to open executable pack"); 609 fatal ("unable to open executable pack");
453 610
454 exe_info (); 611 exe_info ();
455 612
456 if (!home) 613 if (!home)
… …
465 622
466 if (!getcwd (currdir, sizeof (currdir))) 623 if (!getcwd (currdir, sizeof (currdir)))
467 strcpy (currdir, "."); 624 strcpy (currdir, ".");
468 625
469 u_mkdir (home); 626 u_mkdir (home);
627 //strcat (strcat (strcpy (datadir, home), "/."), URLADER);
470 sprintf (datadir, "%s/.%s", home, URLADER); 628 sprintf (datadir, "%s/.%s", home, URLADER);
471 u_mkdir (datadir); 629 u_mkdir (datadir);
472 630
631#if 0
473 if (gethostname (tmppath, sizeof (tmppath))) 632 if (gethostname (tmppath, sizeof (tmppath)))
474 strcpy (tmppath, "default"); 633 strcpy (tmppath, "default");
475 634
476 u_append (datadir, tmppath); 635 u_append (datadir, tmppath);
636#endif
477 637
478 load (); 638 load ();
479 execute (); 639 execute ();
480 640
481 return 0; 641 return 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines