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.13 by root, Tue Jan 17 18:38:37 2012 UTC

1#ifndef URLADER 1/*
2# define URLADER "urlader" 2 * Copyright (c) 2012 Marc Alexander Lehmann <schmorp@schmorp.de>
3#endif 3 *
4#define URLADER_VERSION "1.0" 4 * Redistribution and use in source and binary forms, with or without modifica-
5 * tion, are permitted provided that the following conditions are met:
6 *
7 * 1. Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer.
9 *
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 *
14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
15 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
16 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
17 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
18 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
20 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
21 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
22 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
23 * OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * Alternatively, the contents of this file may be used under the terms of
26 * the GNU General Public License ("GPL") version 2 or any later version,
27 * in which case the provisions of the GPL are applicable instead of
28 * the above. If you wish to allow the use of your version of this file
29 * only under the terms of the GPL and not to allow others to use your
30 * version of this file under the BSD license, indicate your decision
31 * by deleting the provisions above and replace them with the notice
32 * and other provisions required by the GPL. If you do not delete the
33 * provisions above, a recipient may use your version of this file under
34 * either the BSD or the GPL.
35 */
36
37#include "urlib.h"
38#include "urlib.c"
5 39
6#include <stdio.h> 40#include <stdio.h>
7#include <stdlib.h> 41#include <stdlib.h>
8#include <unistd.h> 42#include <unistd.h>
9#include <errno.h> 43#include <errno.h>
10#include <string.h> 44#include <string.h>
11#include <time.h> 45#include <time.h>
12#include <fcntl.h>
13 46
14#include "liblzf/lzf_d.c" 47#include "liblzf/lzf_d.c"
15 48
16#define TAIL_MAGIC "SCHMORPPACK0" 49/* some simple? dynamic memory management for paths might save ltos of ram */
17
18#ifdef _WIN32
19
20 #include <windows.h>
21 //#include <winbase.h>
22 #include <shlobj.h>
23 #include <shlwapi.h>
24 #include <wininet.h>
25
26 static DWORD dword;
27
28 #define u_handle HANDLE
29 #define u_setenv(name,value) SetEnvironmentVariable (name, value)
30 #define u_mkdir(path) !CreateDirectory (path, NULL)
31 #define u_chdir(path) !SetCurrentDirectory (path)
32 #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)
34 #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)
36 #define u_append(path,add) PathAppend (path, add)
37 #define u_write(handle,data,len) (WriteFile (handle, data, len, &dword, 0) ? dword : -1)
38
39 #define u_fsync(handle) FlushFileBuffers (handle)
40 #define u_sync()
41
42#else
43
44 #include <sys/mman.h>
45 #include <sys/types.h>
46 #include <pwd.h>
47
48 #ifdef PATH_MAX
49 #define MAX_PATH (PATH_MAX < 4096 ? 4096 : PATH_MAX)
50 #else
51 #define MAX_PATH 4096
52 #endif
53
54 #define u_handle int
55 #define u_setenv(name,value) setenv (name, value, 1)
56 #define u_mkdir(path) mkdir (path, 0777)
57 #define u_chdir(path) chdir (path)
58 #define u_rename(fr,to) rename (fr, to)
59 #define u_open(path) open (path, O_RDONLY) + 1
60 #define u_creat(path,exec) open (path, O_WRONLY | O_CREAT | O_TRUNC, (exec) ? 0777 : 0666) + 1
61 #define u_close(handle) close (handle - 1)
62 #define u_append(path,add) strcat (strcat (path, "/"), add)
63 #define u_write(handle,data,len) write ((handle) - 1, data, len)
64
65 // on a mostly idle system, a sync at the end is certainly faster, hope for the best
66 #define u_fsync(handle)
67 #define u_sync() sync ()
68
69#endif
70
71#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])
73
74static u_handle pack_handle; 50static u_handle pack_handle;
51static u_handle lock_handle;
75static char tmppath[MAX_PATH]; 52static char tmppath[MAX_PATH];
76static char currdir[MAX_PATH];
77static char datadir[MAX_PATH]; // %AppData%/urlader
78static char exe_dir[MAX_PATH]; // %AppData%/urlader/EXE_ID
79static char execdir[MAX_PATH]; // %AppData%/urlader/EXE_ID/EXE_VER
80static char exe_id[MAX_PATH];
81static char exe_ver[MAX_PATH];
82 53
83static int exe_argc; 54static int exe_argc;
84static const char *exe_argv[32]; 55static u_dynbuf exe_argv;
85 56static u_dynbuf exe_args; /* actual arguments strings copied here */
86static void
87fatal (const char *msg)
88{
89#ifdef _WIN32
90 MessageBox (0, msg, URLADER, 0);
91#else
92 fprintf (stderr, "%s: %s\n", URLADER, msg);
93#endif
94
95 _exit (1);
96}
97 57
98static void 58static void
99tmpdir (const char *dir) 59tmpdir (const char *dir)
100{ 60{
101 static int cnt; 61 static int cnt;
… …
112 return; 72 return;
113 } 73 }
114} 74}
115 75
116static void 76static void
117systemv (const char *const argv[], int dowait) 77systemv (const char *const argv[])
118{ 78{
119#ifdef _WIN32 79#ifdef _WIN32
120 _spawnv (P_WAIT, argv [0], argv); 80 _spawnv (P_WAIT, argv [0], argv);
121#else 81#else
122 pid_t pid = dowait ? fork () : 0; 82 pid_t pid = fork ();
123 83
124 if (pid < 0) 84 if (pid < 0)
125 fatal ("fork failure"); 85 u_fatal ("fork failure");
126 86
127 if (!pid) 87 if (!pid)
128 { 88 {
129 execv (argv [0], (void *)argv); 89 execv (argv [0], (void *)argv);
130 _exit (124); 90 _exit (124);
… …
143 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 }; 103 const char *argv[] = { getenv ("COMSPEC"), "/c", "rd", "/s", "/q", buf, 0 };
144 sprintf (buf, "\"%s\"", path); 104 sprintf (buf, "\"%s\"", path);
145 #else 105 #else
146 const char *argv[] = { "/bin/rm", "-rf", path, 0 }; 106 const char *argv[] = { "/bin/rm", "-rf", path, 0 };
147 #endif 107 #endif
148 systemv (argv, 1); 108 systemv (argv);
149} 109}
150
151enum
152{
153 T_NULL, // 5
154 T_META, // 1 : exe_id, exe_ver
155 T_ENV, // 2 : name, value
156 T_ARG, // 3 : arg
157 T_DIR, // 4+: path
158 T_FILE, // 4+: path, data
159 T_NUM
160};
161
162enum
163{
164 F_EXEC = 1,
165 F_LZF = 2,
166 F_NULL = 0
167};
168
169struct hdr
170{
171 unsigned char type;
172 unsigned char flags;
173 unsigned char namelen[2];
174 unsigned char datalen[4];
175};
176
177struct tail {
178 unsigned char max_filesize[4];
179 unsigned char size[4];
180 char magic[12];
181};
182 110
183static char *pack_base, *pack_end; 111static char *pack_base, *pack_end;
112static struct u_pack_tail *pack_tail;
184static struct hdr *pack_cur; 113static struct u_pack_hdr *pack_cur;
185static char *scratch; 114static char *scratch;
186static unsigned int scratch_len; 115static unsigned int scratch_size;
187 116
188#define PACK_NAME ((char *)(pack_cur + 1)) 117#define PACK_NAME ((char *)(pack_cur + 1))
189#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1) 118#define PACK_DATA (PACK_NAME + u_16 (pack_cur->namelen) + 1)
190#define PACK_VALID pack_cur->type 119#define PACK_VALID pack_cur->type
191 120
192static void 121static void
193pack_next (void) 122pack_next (void)
194{ 123{
195 unsigned int d = u_32 (pack_cur->datalen); 124 unsigned int d = u_32 (pack_cur->datalen);
196 125
197 pack_cur = (struct hdr *)(PACK_DATA + d); 126 pack_cur = (struct u_pack_hdr *)(PACK_DATA + d);
198} 127}
199 128
200static void 129static void
201pack_unmap (void) 130pack_unmap (void)
202{ 131{
203 if (!pack_base) 132 if (pack_base)
204 return; 133 {
205
206 free (scratch);
207
208#ifdef _WIN32
209 UnmapViewOfFile (pack_base);
210#else
211 munmap (pack_base, pack_end - pack_base); 134 u_munmap (pack_base, pack_end - pack_base);
212#endif 135 pack_base = 0;
136 }
137
138 if (scratch)
139 {
140 u_free (scratch, scratch_size);
141 scratch = 0;
142 }
213} 143}
214 144
215static int 145static int
216pack_map (void) 146pack_map (void)
217{ 147{
148 char *addr;
149 unsigned int size;
150
218#ifdef _WIN32 151#ifdef _WIN32
219 BY_HANDLE_FILE_INFORMATION fi; 152 BY_HANDLE_FILE_INFORMATION fi;
220 153
221 if (!GetFileInformationByHandle (pack_handle, &fi)) 154 if (!GetFileInformationByHandle (pack_handle, &fi))
222 return 0; 155 return 0;
223 156
224 if (fi.nFileSizeHigh) // too big 157 size = fi.nFileSizeLow;
158#else
159 size = lseek (pack_handle, 0, SEEK_END);
160#endif
161
162 addr = u_mmap (pack_handle, size);
163 if (!addr)
225 return 0; 164 return 0;
226 165
227 HANDLE handle = CreateFileMapping (pack_handle, 0, PAGE_READONLY, 0, fi.nFileSizeLow, NULL); 166 /*pack_unmap ();*/
228 167
229 if (!handle) 168 pack_base = addr;
169 pack_end = pack_base + size;
170
171 pack_tail = (void *)(pack_end - sizeof (*pack_tail));
172
173 if (memcmp (pack_tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1))
230 return 0; 174 return 0;
231 175
232 pack_unmap (); 176 pack_cur = (struct u_pack_hdr *)(pack_end - u_32 (pack_tail->size));
233 177
234 pack_base = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, fi.nFileSizeLow); 178 if (pack_cur->type != T_META)
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;
247
248 pack_end = pack_base + len;
249#endif
250
251 if (!pack_base)
252 return 0; 179 return 0;
253 180
254 struct tail *tail; 181 scratch = u_malloc (scratch_size = u_32 (pack_tail->max_uncompressed));
255 182 if (!scratch)
256 tail = (void *)(pack_end - sizeof (*tail));
257
258 if (memcmp (tail->magic, TAIL_MAGIC, sizeof (TAIL_MAGIC) - 1))
259 return 0; 183 return 0;
260 184
261 pack_cur = (struct hdr *)(pack_end - u_32 (tail->size));
262
263 free (scratch);
264 scratch = malloc (scratch_len = u_32 (tail->max_filesize));
265
266 return 1; 185 return 1;
267} 186}
268 187
269static void 188static void
270exe_info (void) 189add_arg (char *arg, unsigned int len)
271{ 190{
272 if (!pack_map ()) 191 char *addr = u_dynbuf_append (&exe_args, arg, len);
273 fatal ("unable to locate packfile in executable - executable corrupted?"); 192 u_dynbuf_append (&exe_argv, &addr, sizeof (addr));
274
275 if (pack_cur->type != T_META)
276 fatal ("unable to locate executable metadata - executable corrupted?");
277
278 strcpy (exe_id, PACK_NAME);
279} 193}
280 194
281static void 195static void
282load (void) 196load (void)
283{ 197{
284 u_mkdir (datadir); 198 strcpy (exe_id , PACK_NAME);
285 199 strcpy (exe_ver, PACK_DATA);
286 strcpy (exe_dir, datadir); 200 u_set_exe_info ();
287 u_append (exe_dir, exe_id);
288 u_mkdir (exe_dir);
289 201
290 if (u_chdir (exe_dir)) 202 if (u_chdir (exe_dir))
291 fatal ("unable to change to application data directory"); 203 u_fatal ("unable to change to application data directory");
292 204
293 u_handle h = u_open ("override"); 205 u_handle h = u_open ("override");
294 if (h) 206 if (u_valid (h))
295 { 207 {
296 u_handle oh = pack_handle; 208 u_handle oh = pack_handle;
297 209
210 pack_unmap ();
298 pack_handle = h; 211 pack_handle = h;
212
299 if (!pack_map ()) 213 if (pack_map ()
214 && strcmp (exe_id , PACK_NAME) == 0
215 && strcmp (exe_ver, PACK_DATA) <= 0)
216 u_setenv ("URLADER_OVERRIDE", "override");
217 else
300 { 218 {
219 pack_unmap ();
301 pack_handle = oh; 220 pack_handle = oh;
302 oh = h; 221 oh = h;
222 pack_map ();
303 } 223 }
304 224
305 u_close (oh); 225 u_close (oh);
306 } 226 }
307 227
308 if (pack_cur->type != T_META)
309 fatal ("unable to locate override metadata");
310
311 strcpy (exe_ver, PACK_DATA); 228 strcpy (exe_ver, PACK_DATA);
229 u_set_exe_info ();
312 pack_next (); 230 pack_next ();
313 231
314 for (;;) 232 for (;;)
315 { 233 {
316 if (pack_cur->type == T_ENV) 234 if (pack_cur->type == T_ENV)
317 u_setenv (PACK_NAME, PACK_DATA); 235 u_setenv (PACK_NAME, PACK_DATA);
318 else if (pack_cur->type == T_ARG) 236 else if (pack_cur->type == T_ARG)
319 exe_argv [exe_argc++] = strdup (PACK_NAME); 237 add_arg (PACK_NAME, u_16 (pack_cur->namelen) + 1);
320 else 238 else
321 break; 239 break;
322 240
323 pack_next (); 241 pack_next ();
324 } 242 }
325 243
326done_env_arg: 244done_env_arg:
327 strcpy (execdir, exe_dir); 245
328 u_append (execdir, "i-"); 246 strcat (strcpy (tmppath, execdir), ".lck");
329 strcat (execdir, exe_ver); 247 lock_handle = u_lock (tmppath, 0, 1);
248 if (!lock_handle)
249 u_fatal ("unable to lock application instance");
330 250
331 if (access (execdir, F_OK)) 251 if (access (execdir, F_OK))
332 { 252 {
333 // does not exist yet, so unpack and move 253 // does not exist yet, so unpack and move
334 tmpdir (exe_dir); 254 tmpdir (exe_dir);
335 255
336 if (u_chdir (tmppath)) 256 if (u_chdir (tmppath))
337 fatal ("unable to change to new instance directory"); 257 u_fatal ("unable to change to new instance directory");
338 258
339 for (;;) 259 for (;;)
340 { 260 {
341 switch (pack_cur->type) 261 switch (pack_cur->type)
342 { 262 {
… …
349 u_handle h = u_creat (PACK_NAME, pack_cur->flags & F_EXEC); 269 u_handle h = u_creat (PACK_NAME, pack_cur->flags & F_EXEC);
350 unsigned int dlen, len = u_32 (pack_cur->datalen); 270 unsigned int dlen, len = u_32 (pack_cur->datalen);
351 char *data = PACK_DATA; 271 char *data = PACK_DATA;
352 272
353 if (pack_cur->flags & F_LZF) 273 if (pack_cur->flags & F_LZF)
354 if (dlen = lzf_decompress (data, len, scratch, scratch_len)) 274 if (dlen = lzf_decompress (data, len, scratch, scratch_size))
355 { 275 {
356 data = scratch; 276 data = scratch;
357 len = dlen; 277 len = dlen;
358 } 278 }
359 else 279 else
360 fatal ("unable to uncompress file data - pack corrupted?"); 280 u_fatal ("unable to uncompress file data - pack corrupted?");
361 281
362 if (!h) 282 if (!u_valid (h))
363 fatal ("unable to unpack file from packfile - disk full?"); 283 u_fatal ("unable to unpack file from packfile - disk full?");
364 284
365 if (u_write (h, data, len) != len) 285 if (u_write (h, data, len) != len)
366 fatal ("unable to unpack file from packfile - disk full?"); 286 u_fatal ("unable to unpack file from packfile - disk full?");
367 287
368 u_fsync (h); 288 u_fsync (h);
369 u_close (h); 289 u_close (h);
370 } 290 }
371 break; 291 break;
… …
377 pack_next (); 297 pack_next ();
378 } 298 }
379 299
380done: 300done:
381 if (u_chdir (datadir)) 301 if (u_chdir (datadir))
382 fatal ("unable to change to data directory"); 302 u_fatal ("unable to change to data directory");
383 303
384 u_sync (); 304 u_sync ();
385 305
386 if (u_rename (tmppath, execdir)) 306 if (u_rename (tmppath, execdir))
387 deltree (tmppath); // if move fails, delete new, assume other process created it independently 307 deltree (tmppath); // if move fails, delete new, assume other process created it independently
… …
389 309
390 pack_unmap (); 310 pack_unmap ();
391 u_close (pack_handle); 311 u_close (pack_handle);
392 312
393 if (u_chdir (execdir)) 313 if (u_chdir (execdir))
394 fatal ("unable to change to application instance directory"); 314 u_fatal ("unable to change to application instance directory");
395 315
396 u_setenv ("URLADER_VERSION", URLADER_VERSION); 316 u_setenv ("URLADER_VERSION", URLADER_VERSION);
397 u_setenv ("URLADER_DATADIR", datadir);
398 u_setenv ("URLADER_EXECDIR", execdir);
399 u_setenv ("URLADER_EXE_ID" , exe_id);
400 u_setenv ("URLADER_EXE_DIR", exe_dir);
401 u_setenv ("URLADER_EXE_VER", exe_ver);
402 317
318#if 0
403 // yes, this is overkill 319 // yes, this is overkill
404 u_setenv ("SHLIB_PATH" , execdir); // hpux 320 u_setenv ("SHLIB_PATH" , execdir); // hpux
405 u_setenv ("LIBPATH" , execdir); // aix 321 u_setenv ("LIBPATH" , execdir); // aix
406 u_setenv ("LD_LIBRARY_PATH" , execdir); // most elf systems 322 u_setenv ("LD_LIBRARY_PATH" , execdir); // most elf systems
407 u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris 323 u_setenv ("LD_LIBRARY_PATH_32", execdir); // solaris
408 u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris 324 u_setenv ("LD_LIBRARY_PATH_64", execdir); // solaris
409 u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix 325 u_setenv ("LD_LIBRARYN32_PATH", execdir); // irix
410 u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix 326 u_setenv ("LD_LIBRARY64_PATH" , execdir); // irix
411 u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple 327 u_setenv ("DYLD_LIBRARY_PATH" , execdir); // os sucks from apple
328#endif
412} 329}
413 330
414static void 331static void
415execute (void) 332execute (void)
416{ 333{
417 exe_argv [exe_argc] = 0; 334 char *null = 0;
418 systemv (exe_argv, 0); 335 u_dynbuf_append (&exe_argv, &null, sizeof (null));
336 systemv ((const char *const *)exe_argv.addr);
337}
338
339// this argc/argv is without argv [0]
340static void
341doit (int argc, char *argv[])
342{
343 int i;
344
345 u_setenv ("URLADER_CURRDIR", currdir);
346
347 u_set_datadir ();
348 u_mkdir (datadir);
349
350 if (!pack_map ())
351 u_fatal ("unable to map pack file - executable corrupted?");
352
353 load ();
354
355 while (argc--)
356 {
357 add_arg (*argv, strlen (*argv) + 1);
358 ++argv;
359 }
360
361 execute ();
419} 362}
420 363
421#ifdef _WIN32 364#ifdef _WIN32
422 365
423int APIENTRY 366int APIENTRY
424WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show) 367WinMain (HINSTANCE hI, HINSTANCE hP, LPSTR argv, int command_show)
425{ 368{
426 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath))) 369 if (!GetModuleFileName (hI, tmppath, sizeof (tmppath)))
427 fatal ("unable to find executable pack"); 370 u_fatal ("unable to find executable pack");
428 371
372 u_setenv ("URLADER_EXEPATH", tmppath);
373
429 if (!(pack_handle = u_open (tmppath))) 374 pack_handle = u_open (tmppath);
375 if (!u_valid (pack_handle))
430 fatal ("unable to open executable pack"); 376 u_fatal ("unable to open executable pack");
431
432 exe_info ();
433 377
434 if (!GetCurrentDirectory (sizeof (currdir), currdir)) 378 if (!GetCurrentDirectory (sizeof (currdir), currdir))
435 strcpy (currdir, "."); 379 strcpy (currdir, ".");
436 380
437 if (SHGetFolderPath (0, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, datadir) != S_OK) 381 doit (1, &argv);
438 fatal ("unable to find application data directory");
439
440 u_mkdir (datadir);
441 u_append (datadir, URLADER);
442
443 load ();
444 execute ();
445 382
446 return 0; 383 return 0;
447} 384}
448 385
449#else 386#else
450 387
451int 388int
452main (int argc, char *argv[]) 389main (int argc, char *argv[])
453{ 390{
454 char *home = getenv ("HOME"); 391 u_setenv ("URLADER_EXEPATH", argv [0]);
455 392
456 // we assume fd 0 and 2 are "normal"
457
458 if (!(pack_handle = u_open (argv [0]))) 393 pack_handle = u_open (argv [0]);
394 if (!u_valid (pack_handle))
459 fatal ("unable to open executable pack"); 395 u_fatal ("unable to open executable pack");
460
461 exe_info ();
462
463 if (!home)
464 {
465 struct passwd *pw;
466
467 if ((pw = getpwuid (getuid ())))
468 home = pw->pw_dir;
469 else
470 home = "/tmp";
471 }
472 396
473 if (!getcwd (currdir, sizeof (currdir))) 397 if (!getcwd (currdir, sizeof (currdir)))
474 strcpy (currdir, "."); 398 strcpy (currdir, ".");
475 399
476 u_mkdir (home); 400#if 0
477 sprintf (datadir, "%s/.%s", home, URLADER); 401 /* intersperse hostname, for whatever reason */
478 u_mkdir (datadir);
479 402
480 if (gethostname (tmppath, sizeof (tmppath))) 403 if (gethostname (tmppath, sizeof (tmppath)))
481 strcpy (tmppath, "default"); 404 strcpy (tmppath, "default");
482 405
483 u_append (datadir, tmppath); 406 u_append (datadir, tmppath);
407#endif
484 408
485 load (); 409 doit (argc - 1, argv + 1);
486 execute ();
487 410
488 return 0; 411 return 0;
489} 412}
490 413
491#endif 414#endif

Diff Legend

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