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

Comparing Urlader/urlader.c (file contents):
Revision 1.4 by root, Fri Dec 30 05:27:32 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 45
39 #define u_fsync(handle) FlushFileBuffers (handle) 46 #define u_fsync(handle) FlushFileBuffers (handle)
40 #define u_sync() 47 #define u_sync()
41 48
42#else 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);
43 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
44 #include <sys/mman.h> 60 #include <sys/mman.h>
45 #include <sys/types.h> 61 #include <sys/types.h>
46 #include <pwd.h> 62 #include <pwd.h>
47 63
64 #if defined (MAP_ANON) && !defined (MAP_ANONYMOUS)
65 #define MAP_ANONYMOUS MAP_ANON
66 #endif
67
48 #ifdef PATH_MAX 68 #ifdef PATH_MAX
49 #define MAX_PATH (PATH_MAX < 4096 ? 4096 : PATH_MAX) 69 #define MAX_PATH (PATH_MAX < 4096 ? 4096 : PATH_MAX)
50 #else 70 #else
51 #define MAX_PATH 4096 71 #define MAX_PATH 4096
52 #endif 72 #endif
53 73
54 #define u_handle int 74 #define u_handle int
75 #define u_invalid_handle -1
76 #define u_valid(fd) ((fd) >= 0)
77
55 #define u_setenv(name,value) setenv (name, value, 1) 78 #define u_setenv(name,value) setenv (name, value, 1)
56 #define u_mkdir(path) mkdir (path, 0777) 79 #define u_mkdir(path) mkdir (path, 0777)
57 #define u_chdir(path) chdir (path) 80 #define u_chdir(path) chdir (path)
58 #define u_rename(fr,to) rename (fr, to) 81 #define u_rename(fr,to) rename (fr, to)
59 #define u_open(path) open (path, O_RDONLY) + 1 82 #define u_open(path) open (path, O_RDONLY)
60 #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)
61 #define u_close(handle) close (handle - 1) 84 #define u_close(handle) close (handle)
62 #define u_append(path,add) strcat (strcat (path, "/"), add) 85 #define u_append(path,add) strcat (strcat (path, "/"), add)
63 #define u_write(handle,data,len) write ((handle) - 1, data, len) 86 #define u_write(handle,data,len) write (handle, data, len)
64 87
65 // on a mostly idle system, a sync at the end is certainly faster, hope for the best 88 // on a mostly idle system, a sync at the end is certainly faster, hope for the best
66 #define u_fsync(handle) 89 #define u_fsync(handle)
67 #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);
68 95
69#endif 96#endif
70 97
71#define u_16(ptr) (((ptr)[0] << 8) | (ptr)[1]) 98#define u_16(ptr) (((ptr)[0] << 8) | (ptr)[1])
72#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])
73 100
101/* some simple? dynamic memory management for paths might save ltos of ram */
74static u_handle pack_handle; 102static u_handle pack_handle;
103static u_handle lock_handle;
75static char tmppath[MAX_PATH]; 104static char tmppath[MAX_PATH];
76static char currdir[MAX_PATH]; 105static char currdir[MAX_PATH];
77static char datadir[MAX_PATH]; // %AppData%/urlader 106static char datadir[MAX_PATH]; // %AppData%/urlader
78static char exe_dir[MAX_PATH]; // %AppData%/urlader/EXE_ID 107static char exe_dir[MAX_PATH]; // %AppData%/urlader/EXE_ID
79static char execdir[MAX_PATH]; // %AppData%/urlader/EXE_ID/EXE_VER 108static char execdir[MAX_PATH]; // %AppData%/urlader/EXE_ID/EXE_VER
80static char exe_id[MAX_PATH]; 109static char exe_id[MAX_PATH];
81static char exe_ver[MAX_PATH]; 110static char exe_ver[MAX_PATH];
82 111
83static int exe_argc; 112static int exe_argc;
84static 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;
85 116
86static void 117static void
87fatal (const char *msg) 118fatal (const char *msg)
88{ 119{
89#ifdef _WIN32 120#ifdef _WIN32
90 MessageBox (0, msg, URLADER, 0); 121 MessageBox (0, msg, URLADER, 0);
91#else 122#else
92 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);
93#endif 126#endif
94 127
95 _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
96} 201}
97 202
98static void 203static void
99tmpdir (const char *dir) 204tmpdir (const char *dir)
100{ 205{
… …
111 if (!u_mkdir (tmppath)) 216 if (!u_mkdir (tmppath))
112 return; 217 return;
113 } 218 }
114} 219}
115 220
221enum
222{
223 U_UNLOCK,
224 U_LOCK_READ,
225 U_LOCK_WRITE
226};
227
116static 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
117systemv (const char *const argv[], int dowait) 259systemv (const char *const argv[])
118{ 260{
119#ifdef _WIN32 261#ifdef _WIN32
120 _spawnv (P_WAIT, argv [0], argv); 262 _spawnv (P_WAIT, argv [0], argv);
121#else 263#else
122 pid_t pid = dowait ? fork () : 0; 264 pid_t pid = fork ();
123 265
124 if (pid < 0) 266 if (pid < 0)
125 fatal ("fork failure"); 267 fatal ("fork failure");
126 268
127 if (!pid) 269 if (!pid)
… …
143 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 }; 285 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 };
144 sprintf (buf, "\"%s\"", path); 286 sprintf (buf, "\"%s\"", path);
145 #else 287 #else
146 const char *argv[] = { "/bin/rm", "-rf", path, 0 }; 288 const char *argv[] = { "/bin/rm", "-rf", path, 0 };
147 #endif 289 #endif
148 systemv (argv, 1); 290 systemv (argv);
149} 291}
150 292
151enum 293enum
152{ 294{
153 T_NULL, // 5 295 T_NULL, // 5
… …
181}; 323};
182 324
183static char *pack_base, *pack_end; 325static char *pack_base, *pack_end;
184static struct hdr *pack_cur; 326static struct hdr *pack_cur;
185static char *scratch; 327static char *scratch;
186static unsigned int scratch_len; 328static unsigned int scratch_size;
187 329
188#define PACK_NAME ((char *)(pack_cur + 1)) 330#define PACK_NAME ((char *)(pack_cur + 1))
189#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1) 331#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1)
190#define PACK_VALID pack_cur->type 332#define PACK_VALID pack_cur->type
191 333
… …
198} 340}
199 341
200static void 342static void
201pack_unmap (void) 343pack_unmap (void)
202{ 344{
203 if (!pack_base) 345 if (pack_base)
204 return; 346 {
205
206 free (scratch);
207
208#ifdef _WIN32
209 UnmapViewOfFile (pack_base);
210#else
211 munmap (pack_base, pack_end - pack_base); 347 u_munmap (pack_base, pack_end - pack_base);
212#endif 348 pack_base = 0;
349 }
350
351 if (scratch)
352 {
353 u_free (scratch, scratch_size);
354 scratch = 0;
355 }
213} 356}
214 357
215static int 358static int
216pack_map (void) 359pack_map (void)
217{ 360{
361 char *addr;
362 unsigned int size;
363
218#ifdef _WIN32 364#ifdef _WIN32
219 BY_HANDLE_FILE_INFORMATION fi; 365 BY_HANDLE_FILE_INFORMATION fi;
220 366
221 if (!GetFileInformationByHandle (pack_handle, &fi)) 367 if (!GetFileInformationByHandle (pack_handle, &fi))
222 return 0; 368 return 0;
223 369
224 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)
225 return 0; 377 return 0;
226 378
227 HANDLE handle = CreateFileMapping (pack_handle, 0, PAGE_READONLY, 0, fi.nFileSizeLow, NULL);
228
229 if (!handle)
230 return 0;
231
232 pack_unmap (); 379 pack_unmap ();
233 380
234 pack_base = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, fi.nFileSizeLow);
235
236 CloseHandle (handle);
237
238 pack_end = pack_base + fi.nFileSizeLow;
239#else
240 off_t len = lseek (pack_handle - 1, 0, SEEK_END);
241
242 pack_unmap ();
243
244 pack_base = mmap (0, len, PROT_READ, MAP_SHARED, pack_handle - 1, 0);
245 if (pack_base == (void *)-1)
246 pack_base = 0; 381 pack_base = addr;
247
248 pack_end = pack_base + len; 382 pack_end = pack_base + size;
249#endif
250
251 if (!pack_base)
252 return 0;
253 383
254 struct tail *tail; 384 struct tail *tail;
255 385
256 tail = (void *)(pack_end - sizeof (*tail)); 386 tail = (void *)(pack_end - sizeof (*tail));
257 387
258 if (memcmp (tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1)) 388 if (memcmp (tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1))
259 return 0; 389 return 0;
260 390
261 pack_cur = (struct hdr *)(pack_end - u_32 (tail->size)); 391 pack_cur = (struct hdr *)(pack_end - u_32 (tail->size));
262 392
263 free (scratch);
264 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;
265 396
266 return 1; 397 return 1;
267} 398}
268 399
269static void 400static void
… …
289 420
290 if (u_chdir (exe_dir)) 421 if (u_chdir (exe_dir))
291 fatal ("unable to change to application data directory"); 422 fatal ("unable to change to application data directory");
292 423
293 u_handle h = u_open ("override"); 424 u_handle h = u_open ("override");
294 if (h) 425 if (u_valid (h))
295 { 426 {
296 u_handle oh = pack_handle; 427 u_handle oh = pack_handle;
297 428
298 pack_handle = h; 429 pack_handle = h;
299 if (!pack_map ()) 430 if (!pack_map ())
… …
314 for (;;) 445 for (;;)
315 { 446 {
316 if (pack_cur->type == T_ENV) 447 if (pack_cur->type == T_ENV)
317 u_setenv (PACK_NAME, PACK_DATA); 448 u_setenv (PACK_NAME, PACK_DATA);
318 else if (pack_cur->type == T_ARG) 449 else if (pack_cur->type == T_ARG)
319 exe_argv [exe_argc++] = strdup (PACK_NAME); 450 {
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 }
320 else 456 else
321 break; 457 break;
322 458
323 pack_next (); 459 pack_next ();
324 } 460 }
325 461
326done_env_arg: 462done_env_arg:
327 strcpy (execdir, exe_dir); 463 strcpy (execdir, exe_dir);
328 u_append (execdir, "i-"); 464 u_append (execdir, "i-");
329 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);
330 478
331 if (access (execdir, F_OK)) 479 if (access (execdir, F_OK))
332 { 480 {
333 // does not exist yet, so unpack and move 481 // does not exist yet, so unpack and move
334 tmpdir (exe_dir); 482 tmpdir (exe_dir);
… …
349 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);
350 unsigned int dlen, len = u_32 (pack_cur->datalen); 498 unsigned int dlen, len = u_32 (pack_cur->datalen);
351 char *data = PACK_DATA; 499 char *data = PACK_DATA;
352 500
353 if (pack_cur->flags & F_LZF) 501 if (pack_cur->flags & F_LZF)
354 if (dlen = lzf_decompress (data, len, scratch, scratch_len)) 502 if (dlen = lzf_decompress (data, len, scratch, scratch_size))
355 { 503 {
356 data = scratch; 504 data = scratch;
357 len = dlen; 505 len = dlen;
358 } 506 }
359 else 507 else
360 fatal ("unable to uncompress file data - pack corrupted?"); 508 fatal ("unable to uncompress file data - pack corrupted?");
361 509
362 if (!h) 510 if (!u_valid (h))
363 fatal ("unable to unpack file from packfile - disk full?"); 511 fatal ("unable to unpack file from packfile - disk full?");
364 512
365 if (u_write (h, data, len) != len) 513 if (u_write (h, data, len) != len)
366 fatal ("unable to unpack file from packfile - disk full?"); 514 fatal ("unable to unpack file from packfile - disk full?");
367 515
… …
398 u_setenv ("URLADER_EXECDIR", execdir); 546 u_setenv ("URLADER_EXECDIR", execdir);
399 u_setenv ("URLADER_EXE_ID" , exe_id); 547 u_setenv ("URLADER_EXE_ID" , exe_id);
400 u_setenv ("URLADER_EXE_DIR", exe_dir); 548 u_setenv ("URLADER_EXE_DIR", exe_dir);
401 u_setenv ("URLADER_EXE_VER", exe_ver); 549 u_setenv ("URLADER_EXE_VER", exe_ver);
402 550
551#if 0
403 // yes, this is overkill 552 // yes, this is overkill
404 u_setenv ("SHLIB_PATH" , execdir); // hpux 553 u_setenv ("SHLIB_PATH" , execdir); // hpux
405 u_setenv ("LIBPATH" , execdir); // aix 554 u_setenv ("LIBPATH" , execdir); // aix
406 u_setenv ("LD_LIBRARY_PATH" , execdir); // most elf systems 555 u_setenv ("LD_LIBRARY_PATH" , execdir); // most elf systems
407 u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris 556 u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris
408 u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris 557 u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris
409 u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix 558 u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix
410 u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix 559 u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix
411 u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple 560 u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple
561#endif
412} 562}
413 563
414static void 564static void
415execute (void) 565execute (void)
416{ 566{
417 exe_argv [exe_argc] = 0; 567 exe_argv [exe_argc] = 0;
418 systemv (exe_argv, 0); 568 systemv (exe_argv);
419} 569}
420 570
421#ifdef _WIN32 571#ifdef _WIN32
422 572
423int APIENTRY 573int APIENTRY
424WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show) 574WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show)
425{ 575{
426 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath))) 576 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath)))
427 fatal ("unable to find executable pack"); 577 fatal ("unable to find executable pack");
428 578
429 if (!(pack_handle = u_open (tmppath))) 579 pack_handle = u_open (tmppath);
580 if (!u_valid (pack_handle))
430 fatal ("unable to open executable pack"); 581 fatal ("unable to open executable pack");
431 582
432 exe_info (); 583 exe_info ();
433 584
434 if (!GetCurrentDirectory (sizeof (currdir), currdir)) 585 if (!GetCurrentDirectory (sizeof (currdir), currdir))
… …
451int 602int
452main (int argc, char *argv[]) 603main (int argc, char *argv[])
453{ 604{
454 char *home = getenv ("HOME"); 605 char *home = getenv ("HOME");
455 606
456 // we assume fd 0 and 2 are "normal"
457
458 if (!(pack_handle = u_open (argv [0]))) 607 pack_handle = u_open (argv [0]);
608 if (!u_valid (pack_handle))
459 fatal ("unable to open executable pack"); 609 fatal ("unable to open executable pack");
460 610
461 exe_info (); 611 exe_info ();
462 612
463 if (!home) 613 if (!home)
… …
472 622
473 if (!getcwd (currdir, sizeof (currdir))) 623 if (!getcwd (currdir, sizeof (currdir)))
474 strcpy (currdir, "."); 624 strcpy (currdir, ".");
475 625
476 u_mkdir (home); 626 u_mkdir (home);
627 //strcat (strcat (strcpy (datadir, home), "/."), URLADER);
477 sprintf (datadir, "%s/.%s", home, URLADER); 628 sprintf (datadir, "%s/.%s", home, URLADER);
478 u_mkdir (datadir); 629 u_mkdir (datadir);
479 630
631#if 0
480 if (gethostname (tmppath, sizeof (tmppath))) 632 if (gethostname (tmppath, sizeof (tmppath)))
481 strcpy (tmppath, "default"); 633 strcpy (tmppath, "default");
482 634
483 u_append (datadir, tmppath); 635 u_append (datadir, tmppath);
636#endif
484 637
485 load (); 638 load ();
486 execute (); 639 execute ();
487 640
488 return 0; 641 return 0;

Diff Legend

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