author | glx |
Tue, 25 Sep 2007 14:15:38 +0000 | |
changeset 8124 | beda591abd6c |
parent 8121 | 418ce56ce3a6 |
child 8301 | 47e8f031a6ab |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6505
diff
changeset
|
3 |
/** @file fileio.cpp Standard In/Out file operations */ |
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6218
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1198
diff
changeset
|
6 |
#include "openttd.h" |
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1039
diff
changeset
|
7 |
#include "fileio.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
8 |
#include "functions.h" |
4200
a45420ba0c23
(svn r5684) - Codechange: create an strtolower() function that uses tolower() on a whole string and apply it in the places this was used.
Darkvater
parents:
4077
diff
changeset
|
9 |
#include "string.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2153
diff
changeset
|
10 |
#include "macros.h" |
2153
91e89aa8c299
(svn r2663) Include variables.h only in these files which need it, not globally via openttd.h
tron
parents:
1891
diff
changeset
|
11 |
#include "variables.h" |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
12 |
#include "debug.h" |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
13 |
#include "fios.h" |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
14 |
#ifdef WIN32 |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
15 |
#include <windows.h> |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
16 |
#else |
6649
5598de323f01
(svn r9281) -Fix [FS#687]: compile failure when compiling with 'home directories' enabled (stepancheg).
rubidium
parents:
6646
diff
changeset
|
17 |
#include <pwd.h> |
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
18 |
#include <unistd.h> |
8085
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
19 |
#endif |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
20 |
#include <sys/stat.h> |
0 | 21 |
|
22 |
/*************************************************/ |
|
23 |
/* FILE IO ROUTINES ******************************/ |
|
24 |
/*************************************************/ |
|
25 |
||
26 |
#define FIO_BUFFER_SIZE 512 |
|
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
27 |
#define MAX_HANDLES 64 |
0 | 28 |
|
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
29 |
struct Fio { |
4203
790879e123dd
(svn r5687) - Cleanup: Some cleanup and commentarizing.
Darkvater
parents:
4202
diff
changeset
|
30 |
byte *buffer, *buffer_end; ///< position pointer in local buffer and last valid byte of buffer |
790879e123dd
(svn r5687) - Cleanup: Some cleanup and commentarizing.
Darkvater
parents:
4202
diff
changeset
|
31 |
uint32 pos; ///< current (system) position in file |
790879e123dd
(svn r5687) - Cleanup: Some cleanup and commentarizing.
Darkvater
parents:
4202
diff
changeset
|
32 |
FILE *cur_fh; ///< current file handle |
7392
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
33 |
const char *filename; ///< current filename |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
34 |
FILE *handles[MAX_HANDLES]; ///< array of file handles we can have open |
4203
790879e123dd
(svn r5687) - Cleanup: Some cleanup and commentarizing.
Darkvater
parents:
4202
diff
changeset
|
35 |
byte buffer_start[FIO_BUFFER_SIZE]; ///< local buffer when read from file |
7392
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
36 |
const char *filenames[MAX_HANDLES]; ///< array of filenames we (should) have open |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
37 |
#if defined(LIMITED_FDS) |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
38 |
uint open_handles; ///< current amount of open handles |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
39 |
uint usage_count[MAX_HANDLES]; ///< count how many times this file has been opened |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
40 |
#endif /* LIMITED_FDS */ |
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
41 |
}; |
0 | 42 |
|
43 |
static Fio _fio; |
|
44 |
||
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6218
diff
changeset
|
45 |
/* Get current position in file */ |
6573 | 46 |
uint32 FioGetPos() |
0 | 47 |
{ |
48 |
return _fio.pos + (_fio.buffer - _fio.buffer_start) - FIO_BUFFER_SIZE; |
|
49 |
} |
|
50 |
||
7392
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
51 |
const char *FioGetFilename() |
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
52 |
{ |
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
53 |
return _fio.filename; |
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
54 |
} |
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
55 |
|
0 | 56 |
void FioSeekTo(uint32 pos, int mode) |
57 |
{ |
|
58 |
if (mode == SEEK_CUR) pos += FioGetPos(); |
|
59 |
_fio.buffer = _fio.buffer_end = _fio.buffer_start + FIO_BUFFER_SIZE; |
|
4203
790879e123dd
(svn r5687) - Cleanup: Some cleanup and commentarizing.
Darkvater
parents:
4202
diff
changeset
|
60 |
_fio.pos = pos; |
790879e123dd
(svn r5687) - Cleanup: Some cleanup and commentarizing.
Darkvater
parents:
4202
diff
changeset
|
61 |
fseek(_fio.cur_fh, _fio.pos, SEEK_SET); |
0 | 62 |
} |
63 |
||
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
64 |
#if defined(LIMITED_FDS) |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
65 |
static void FioRestoreFile(int slot) |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
66 |
{ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
67 |
/* Do we still have the file open, or should we reopen it? */ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
68 |
if (_fio.handles[slot] == NULL) { |
7848 | 69 |
DEBUG(misc, 6, "Restoring file '%s' in slot '%d' from disk", _fio.filenames[slot], slot); |
70 |
FioOpenFile(slot, _fio.filenames[slot]); |
|
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
71 |
} |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
72 |
_fio.usage_count[slot]++; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
73 |
} |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
74 |
#endif /* LIMITED_FDS */ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
75 |
|
6505
abcb0580d976
(svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style.
belugas
parents:
6218
diff
changeset
|
76 |
/* Seek to a file and a position */ |
8066
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
77 |
void FioSeekToFile(uint8 slot, uint32 pos) |
0 | 78 |
{ |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
79 |
FILE *f; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
80 |
#if defined(LIMITED_FDS) |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
81 |
/* Make sure we have this file open */ |
8066
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
82 |
FioRestoreFile(slot); |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
83 |
#endif /* LIMITED_FDS */ |
8066
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
84 |
f = _fio.handles[slot]; |
0 | 85 |
assert(f != NULL); |
86 |
_fio.cur_fh = f; |
|
8066
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
87 |
_fio.filename = _fio.filenames[slot]; |
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
88 |
FioSeekTo(pos, SEEK_SET); |
0 | 89 |
} |
90 |
||
6573 | 91 |
byte FioReadByte() |
0 | 92 |
{ |
93 |
if (_fio.buffer == _fio.buffer_end) { |
|
94 |
_fio.pos += FIO_BUFFER_SIZE; |
|
95 |
fread(_fio.buffer = _fio.buffer_start, 1, FIO_BUFFER_SIZE, _fio.cur_fh); |
|
96 |
} |
|
97 |
return *_fio.buffer++; |
|
98 |
} |
|
99 |
||
100 |
void FioSkipBytes(int n) |
|
101 |
{ |
|
2952 | 102 |
for (;;) { |
0 | 103 |
int m = min(_fio.buffer_end - _fio.buffer, n); |
104 |
_fio.buffer += m; |
|
105 |
n -= m; |
|
106 |
if (n == 0) break; |
|
107 |
FioReadByte(); |
|
108 |
n--; |
|
109 |
} |
|
110 |
} |
|
111 |
||
6573 | 112 |
uint16 FioReadWord() |
0 | 113 |
{ |
114 |
byte b = FioReadByte(); |
|
115 |
return (FioReadByte() << 8) | b; |
|
116 |
} |
|
117 |
||
6573 | 118 |
uint32 FioReadDword() |
0 | 119 |
{ |
120 |
uint b = FioReadWord(); |
|
121 |
return (FioReadWord() << 16) | b; |
|
122 |
} |
|
123 |
||
124 |
void FioReadBlock(void *ptr, uint size) |
|
125 |
{ |
|
126 |
FioSeekTo(FioGetPos(), SEEK_SET); |
|
127 |
_fio.pos += size; |
|
128 |
fread(ptr, 1, size, _fio.cur_fh); |
|
129 |
} |
|
130 |
||
1039
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
131 |
static inline void FioCloseFile(int slot) |
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
132 |
{ |
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
133 |
if (_fio.handles[slot] != NULL) { |
1109
1bab892228cd
(svn r1610) Remove trailing whitespace (last time ever, i hope)
tron
parents:
1093
diff
changeset
|
134 |
fclose(_fio.handles[slot]); |
1039
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
135 |
_fio.handles[slot] = NULL; |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
136 |
#if defined(LIMITED_FDS) |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
137 |
_fio.open_handles--; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
138 |
#endif /* LIMITED_FDS */ |
1039
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
139 |
} |
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
140 |
} |
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
141 |
|
6573 | 142 |
void FioCloseAll() |
0 | 143 |
{ |
144 |
int i; |
|
145 |
||
1039
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
146 |
for (i = 0; i != lengthof(_fio.handles); i++) |
8736f759759b
(svn r1540) -Fix: since grf files are reopened on every load/new game, close the old opened to fix stale filehandles (thx tamlin)
darkvater
parents:
1036
diff
changeset
|
147 |
FioCloseFile(i); |
0 | 148 |
} |
149 |
||
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
150 |
#if defined(LIMITED_FDS) |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
151 |
static void FioFreeHandle() |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
152 |
{ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
153 |
/* If we are about to open a file that will exceed the limit, close a file */ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
154 |
if (_fio.open_handles + 1 == LIMITED_FDS) { |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
155 |
uint i, count; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
156 |
int slot; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
157 |
|
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
158 |
count = UINT_MAX; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
159 |
slot = -1; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
160 |
/* Find the file that is used the least */ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
161 |
for (i = 0; i < lengthof(_fio.handles); i++) { |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
162 |
if (_fio.handles[i] != NULL && _fio.usage_count[i] < count) { |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
163 |
count = _fio.usage_count[i]; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
164 |
slot = i; |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
165 |
} |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
166 |
} |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
167 |
assert(slot != -1); |
7848 | 168 |
DEBUG(misc, 6, "Closing filehandler '%s' in slot '%d' because of fd-limit", _fio.filenames[slot], slot); |
6218
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
169 |
FioCloseFile(slot); |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
170 |
} |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
171 |
} |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
172 |
#endif /* LIMITED_FDS */ |
89dc931b8d78
(svn r8647) -Codechange: add a general way to handle platforms who can only have a limited amount of file-descripters open at any given time.
truelight
parents:
5835
diff
changeset
|
173 |
|
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
174 |
void FioOpenFile(int slot, const char *filename) |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
175 |
{ |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
176 |
FILE *f; |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
177 |
|
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
178 |
#if defined(LIMITED_FDS) |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
179 |
FioFreeHandle(); |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
180 |
#endif /* LIMITED_FDS */ |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
181 |
f = FioFOpenFile(filename); |
6920
ee15b916f758
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6649
diff
changeset
|
182 |
if (f == NULL) error("Cannot open file '%s'", filename); |
8066
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
183 |
uint32 pos = ftell(f); |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
184 |
|
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
185 |
FioCloseFile(slot); // if file was opened before, close it |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
186 |
_fio.handles[slot] = f; |
7392
a716551b0c7f
(svn r10143) -Add: store the filename of the grfs opened and allow easy access to the name
truelight
parents:
7371
diff
changeset
|
187 |
_fio.filenames[slot] = filename; |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
188 |
#if defined(LIMITED_FDS) |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
189 |
_fio.usage_count[slot] = 0; |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
190 |
_fio.open_handles++; |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
191 |
#endif /* LIMITED_FDS */ |
8066
7acd480e05c9
(svn r11095) -Codechange: don't abuse 'file_pos' by storing the file_slot in it too, but use a nice seperate variable for it
truelight
parents:
7848
diff
changeset
|
192 |
FioSeekToFile(slot, pos); |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
193 |
} |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
194 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
195 |
const char *_subdirs[NUM_SUBDIRS] = { |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
196 |
"", |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
197 |
"save" PATHSEP, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
198 |
"save" PATHSEP "autosave" PATHSEP, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
199 |
"scenario" PATHSEP, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
200 |
"scenario" PATHSEP "heightmap" PATHSEP, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
201 |
"gm" PATHSEP, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
202 |
"data" PATHSEP, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
203 |
"lang" PATHSEP |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
204 |
}; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
205 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
206 |
const char *_searchpaths[NUM_SEARCHPATHS]; |
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
207 |
TarList _tar_list; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
208 |
TarFileList _tar_filelist; |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
209 |
|
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
210 |
/** |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
211 |
* Check whether the given file exists |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
212 |
* @param filename the file to try for existance |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
213 |
* @param subdir the subdirectory to look in |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
214 |
* @return true if and only if the file can be opened |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
215 |
*/ |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
216 |
bool FioCheckFileExists(const char *filename, Subdirectory subdir) |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
217 |
{ |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
218 |
FILE *f = FioFOpenFile(filename, "rb", subdir); |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
219 |
if (f == NULL) return false; |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
220 |
|
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
221 |
FioFCloseFile(f); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
222 |
return true; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
223 |
} |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
224 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
225 |
/** |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
226 |
* Close a file in a safe way. |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
227 |
*/ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
228 |
void FioFCloseFile(FILE *f) |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
229 |
{ |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
230 |
fclose(f); |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
231 |
} |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
232 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
233 |
char *FioGetFullPath(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir, const char *filename) |
2736
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
234 |
{ |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
235 |
assert(subdir < NUM_SUBDIRS); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
236 |
assert(sp < NUM_SEARCHPATHS); |
2736
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
237 |
|
7437
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
238 |
snprintf(buf, buflen, "%s%s%s", _searchpaths[sp], _subdirs[subdir], filename); |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
239 |
return buf; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
240 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
241 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
242 |
char *FioFindFullPath(char *buf, size_t buflen, Subdirectory subdir, const char *filename) |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
243 |
{ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
244 |
Searchpath sp; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
245 |
assert(subdir < NUM_SUBDIRS); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
246 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
247 |
FOR_ALL_SEARCHPATHS(sp) { |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
248 |
FioGetFullPath(buf, buflen, sp, subdir, filename); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
249 |
if (FileExists(buf)) break; |
6920
ee15b916f758
(svn r9560) -Codechange: add support for multiple 'base' directories for newgrf searching.
rubidium
parents:
6649
diff
changeset
|
250 |
} |
2736
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
251 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
252 |
return buf; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
253 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
254 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
255 |
char *FioAppendDirectory(char *buf, size_t buflen, Searchpath sp, Subdirectory subdir) |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
256 |
{ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
257 |
assert(subdir < NUM_SUBDIRS); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
258 |
assert(sp < NUM_SEARCHPATHS); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
259 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
260 |
snprintf(buf, buflen, "%s%s", _searchpaths[sp], _subdirs[subdir]); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
261 |
return buf; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
262 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
263 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
264 |
char *FioGetDirectory(char *buf, size_t buflen, Subdirectory subdir) |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
265 |
{ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
266 |
Searchpath sp; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
267 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
268 |
/* Find and return the first valid directory */ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
269 |
FOR_ALL_SEARCHPATHS(sp) { |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
270 |
char *ret = FioAppendDirectory(buf, buflen, sp, subdir); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
271 |
if (FileExists(buf)) return ret; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
272 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
273 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
274 |
/* Could not find the directory, fall back to a base path */ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
275 |
ttd_strlcpy(buf, _personal_dir, buflen); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
276 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
277 |
return buf; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
278 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
279 |
|
8070
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
280 |
FILE *FioFOpenFileSp(const char *filename, const char *mode, Searchpath sp, Subdirectory subdir, size_t *filesize) |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
281 |
{ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
282 |
#if defined(WIN32) && defined(UNICODE) |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
283 |
/* fopen is implemented as a define with ellipses for |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
284 |
* Unicode support (prepend an L). As we are not sending |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
285 |
* a string, but a variable, it 'renames' the variable, |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
286 |
* so make that variable to makes it compile happily */ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
287 |
wchar_t Lmode[5]; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
288 |
MultiByteToWideChar(CP_ACP, 0, mode, -1, Lmode, lengthof(Lmode)); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
289 |
#endif |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
290 |
FILE *f = NULL; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
291 |
char buf[MAX_PATH]; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
292 |
|
7431
f340111a55ec
(svn r10188) -Codechange: make it a little easier to load a savegame from the console:
rubidium
parents:
7425
diff
changeset
|
293 |
if (subdir == NO_DIRECTORY) { |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
294 |
ttd_strlcpy(buf, filename, lengthof(buf)); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
295 |
} else { |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
296 |
snprintf(buf, lengthof(buf), "%s%s%s", _searchpaths[sp], _subdirs[subdir], filename); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
297 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
298 |
|
8120
2ab4ad82fd44
(svn r11155) -Fix [FS#1253]: work around a nasty MS CRT 8 SP1 bug making it virtually impossible to debug 32bpp games under MSVC (http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=257606). Patch by boekabart.
rubidium
parents:
8088
diff
changeset
|
299 |
#if defined(WIN32) |
8124
beda591abd6c
(svn r11159) -Fix (r11155): restore the ability to save in a non existing file
glx
parents:
8121
diff
changeset
|
300 |
if (mode[0] == 'r' && GetFileAttributes(OTTD2FS(buf)) == INVALID_FILE_ATTRIBUTES) return NULL; |
8120
2ab4ad82fd44
(svn r11155) -Fix [FS#1253]: work around a nasty MS CRT 8 SP1 bug making it virtually impossible to debug 32bpp games under MSVC (http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=257606). Patch by boekabart.
rubidium
parents:
8088
diff
changeset
|
301 |
#endif |
2ab4ad82fd44
(svn r11155) -Fix [FS#1253]: work around a nasty MS CRT 8 SP1 bug making it virtually impossible to debug 32bpp games under MSVC (http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=257606). Patch by boekabart.
rubidium
parents:
8088
diff
changeset
|
302 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
303 |
f = fopen(buf, mode); |
2736
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
304 |
#if !defined(WIN32) |
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
305 |
if (f == NULL) { |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
306 |
strtolower(buf + strlen(_searchpaths[sp]) - 1); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
307 |
f = fopen(buf, mode); |
2736
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
308 |
} |
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
309 |
#endif |
8070
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
310 |
if (f != NULL && filesize != NULL) { |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
311 |
/* Find the size of the file */ |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
312 |
fseek(f, 0, SEEK_END); |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
313 |
*filesize = ftell(f); |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
314 |
fseek(f, 0, SEEK_SET); |
959633559d9f
(svn r11099) -Codechange: allow on opening of a file via FioFOpenFile to request the size of the file, so we can keep that in mind
truelight
parents:
8066
diff
changeset
|
315 |
} |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
316 |
return f; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
317 |
} |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
318 |
|
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
319 |
FILE *FioFOpenFileTar(TarFileListEntry *entry, size_t *filesize) |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
320 |
{ |
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
321 |
FILE *f = fopen(entry->tar->filename, "rb"); |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
322 |
assert(f != NULL); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
323 |
|
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
324 |
fseek(f, entry->position, SEEK_SET); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
325 |
if (filesize != NULL) *filesize = entry->size; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
326 |
return f; |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
327 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
328 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
329 |
/** Opens OpenTTD files somewhere in a personal or global directory */ |
8071 | 330 |
FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir, size_t *filesize) |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
331 |
{ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
332 |
FILE *f = NULL; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
333 |
Searchpath sp; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
334 |
|
7431
f340111a55ec
(svn r10188) -Codechange: make it a little easier to load a savegame from the console:
rubidium
parents:
7425
diff
changeset
|
335 |
assert(subdir < NUM_SUBDIRS || subdir == NO_DIRECTORY); |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
336 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
337 |
FOR_ALL_SEARCHPATHS(sp) { |
8071 | 338 |
f = FioFOpenFileSp(filename, mode, sp, subdir, filesize); |
7431
f340111a55ec
(svn r10188) -Codechange: make it a little easier to load a savegame from the console:
rubidium
parents:
7425
diff
changeset
|
339 |
if (f != NULL || subdir == NO_DIRECTORY) break; |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
340 |
} |
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
341 |
|
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
342 |
/* We can only use .tar in case of data-dir, and read-mode */ |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
343 |
if (f == NULL && subdir == DATA_DIR && mode[0] == 'r') { |
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
344 |
/* Filenames in tars are always forced to be lowercase */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
345 |
char *lcfilename = strdup(filename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
346 |
strtolower(lcfilename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
347 |
TarFileList::iterator it = _tar_filelist.find(lcfilename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
348 |
free(lcfilename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
349 |
if (it != _tar_filelist.end()) { |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
350 |
f = FioFOpenFileTar(&((*it).second), filesize); |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
351 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
352 |
} |
2736
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
353 |
|
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
354 |
return f; |
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
355 |
} |
1ea068235989
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents:
2548
diff
changeset
|
356 |
|
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
357 |
/** |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
358 |
* Create a directory with the given name |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
359 |
* @param name the new name of the directory |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
360 |
*/ |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
361 |
void FioCreateDirectory(const char *name) |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
362 |
{ |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
363 |
#if defined(WIN32) || defined(WINCE) |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
364 |
CreateDirectory(OTTD2FS(name), NULL); |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
365 |
#elif defined(OS2) && !defined(__INNOTEK_LIBC__) |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
366 |
mkdir(OTTD2FS(name)); |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
367 |
#else |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
368 |
mkdir(OTTD2FS(name), 0755); |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
369 |
#endif |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
370 |
} |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
371 |
|
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
372 |
/** |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
373 |
* Appends, if necessary, the path separator character to the end of the string. |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
374 |
* It does not add the path separator to zero-sized strings. |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
375 |
* @param buf string to append the separator to |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
376 |
* @param buflen the length of the buf |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
377 |
*/ |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
378 |
void AppendPathSeparator(char *buf, size_t buflen) |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
379 |
{ |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
380 |
size_t s = strlen(buf); |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
381 |
|
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
382 |
/* Length of string + path separator + '\0' */ |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
383 |
if (s != 0 && buf[s - 1] != PATHSEPCHAR && s + 2 < buflen) { |
6625
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
384 |
buf[s] = PATHSEPCHAR; |
3348b52bd823
(svn r9130) -Codechange: move the fileio functions that do open a file into a Fio slot together.
rubidium
parents:
6624
diff
changeset
|
385 |
buf[s + 1] = '\0'; |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
386 |
} |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
387 |
} |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
388 |
|
7330
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
389 |
/** |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
390 |
* Allocates and files a variable with the full path |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
391 |
* based on the given directory. |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
392 |
* @param dir the directory to base the path on |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
393 |
* @return the malloced full path |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
394 |
*/ |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
395 |
char *BuildWithFullPath(const char *dir) |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
396 |
{ |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
397 |
char *dest = MallocT<char>(MAX_PATH); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
398 |
ttd_strlcpy(dest, dir, MAX_PATH); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
399 |
|
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
400 |
/* Check if absolute or relative path */ |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
401 |
const char *s = strchr(dest, PATHSEPCHAR); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
402 |
|
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
403 |
/* Add absolute path */ |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
404 |
if (s == NULL || dest != s) { |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
405 |
getcwd(dest, MAX_PATH); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
406 |
AppendPathSeparator(dest, MAX_PATH); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
407 |
ttd_strlcat(dest, dir, MAX_PATH); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
408 |
} |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
409 |
AppendPathSeparator(dest, MAX_PATH); |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
410 |
|
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
411 |
return dest; |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
412 |
} |
577e92774f23
(svn r10073) -Codechange: make the NewGRF paths in the config file without any full paths (again).
rubidium
parents:
7251
diff
changeset
|
413 |
|
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
414 |
static bool TarListAddFile(const char *filename) |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
415 |
{ |
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
416 |
/* The TAR-header, repeated for every file */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
417 |
typedef struct TarHeader { |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
418 |
char name[100]; ///< Name of the file |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
419 |
char mode[8]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
420 |
char uid[8]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
421 |
char gid[8]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
422 |
char size[12]; ///< Size of the file, in ASCII |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
423 |
char mtime[12]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
424 |
char chksum[8]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
425 |
char typeflag; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
426 |
char linkname[100]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
427 |
char magic[6]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
428 |
char version[2]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
429 |
char uname[32]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
430 |
char gname[32]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
431 |
char devmajor[8]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
432 |
char devminor[8]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
433 |
char prefix[155]; ///< Path of the file |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
434 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
435 |
char unused[12]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
436 |
} TarHeader; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
437 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
438 |
/* Check if we already seen this file */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
439 |
TarList::iterator it = _tar_list.find(filename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
440 |
if (it != _tar_list.end()) return false; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
441 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
442 |
FILE *f = fopen(filename, "rb"); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
443 |
assert(f != NULL); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
444 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
445 |
TarListEntry *tar_entry = MallocT<TarListEntry>(1); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
446 |
tar_entry->filename = strdup(filename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
447 |
_tar_list.insert(TarList::value_type(filename, tar_entry)); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
448 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
449 |
TarHeader th; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
450 |
char buf[sizeof(th.name) + 1], *end; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
451 |
char name[sizeof(th.prefix) + 1 + sizeof(th.name) + 1]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
452 |
int num = 0, pos = 0; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
453 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
454 |
/* Make a char of 512 empty bytes */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
455 |
char empty[512]; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
456 |
memset(&empty[0], 0, sizeof(empty)); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
457 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
458 |
while (!feof(f)) { |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
459 |
fread(&th, 1, 512, f); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
460 |
pos += 512; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
461 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
462 |
/* Check if we have the new tar-format (ustar) or the old one (a lot of zeros after 'link' field) */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
463 |
if (strncmp(th.magic, "ustar", 5) != 0 && memcmp(&th.magic, &empty[0], 512 - offsetof(TarHeader, magic)) != 0) { |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
464 |
/* If we have only zeros in the block, it can be an end-of-file indicator */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
465 |
if (memcmp(&th, &empty[0], 512) == 0) continue; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
466 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
467 |
DEBUG(misc, 0, "The file '%s' isn't a valid tar-file", filename); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
468 |
return false; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
469 |
} |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
470 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
471 |
name[0] = '\0'; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
472 |
int len = 0; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
473 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
474 |
/* The prefix contains the directory-name */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
475 |
if (th.prefix[0] != '\0') { |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
476 |
memcpy(name, th.prefix, sizeof(th.prefix)); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
477 |
name[sizeof(th.prefix)] = '\0'; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
478 |
len = strlen(name); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
479 |
name[len] = PATHSEPCHAR; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
480 |
len++; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
481 |
} |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
482 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
483 |
/* Copy the name of the file in a safe way at the end of 'name' */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
484 |
memcpy(&name[len], th.name, sizeof(th.name)); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
485 |
name[len + sizeof(th.name)] = '\0'; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
486 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
487 |
/* Calculate the size of the file.. for some strange reason this is stored as a string */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
488 |
memcpy(buf, th.size, sizeof(th.size)); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
489 |
buf[sizeof(th.size)] = '\0'; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
490 |
int skip = strtol(buf, &end, 8); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
491 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
492 |
/* 0 byte sized files can be skipped (dirs, symlinks, ..) */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
493 |
if (skip == 0) continue; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
494 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
495 |
/* Store this entry in the list */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
496 |
TarFileListEntry entry; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
497 |
entry.tar = tar_entry; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
498 |
entry.size = skip; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
499 |
entry.position = pos; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
500 |
/* Force lowercase */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
501 |
strtolower(name); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
502 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
503 |
/* Tar-files always have '/' path-seperator, but we want our PATHSEPCHAR */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
504 |
#if (PATHSEPCHAR != '/') |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
505 |
for (char *n = name; *n != '\0'; n++) if (*n == '/') *n = PATHSEPCHAR; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
506 |
#endif |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
507 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
508 |
DEBUG(misc, 6, "Found file in tar: %s (%d bytes, %d offset)", name, skip, pos); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
509 |
if (_tar_filelist.insert(TarFileList::value_type(name, entry)).second) num++; |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
510 |
|
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
511 |
/* Skip to the next block.. */ |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
512 |
skip = ALIGN(skip, 512); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
513 |
fseek(f, skip, SEEK_CUR); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
514 |
pos += skip; |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
515 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
516 |
|
8088
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
517 |
DEBUG(misc, 1, "Found tar '%s' with %d new files", filename, num); |
7c1a4dd586ae
(svn r11119) -Codechange: analyze .tar files upon loading, remembering their files and offsets, which speeds up .tar handling with a big factor
truelight
parents:
8086
diff
changeset
|
518 |
fclose(f); |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
519 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
520 |
return true; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
521 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
522 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
523 |
static int ScanPathForTarFiles(const char *path, int basepath_length) |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
524 |
{ |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
525 |
extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
526 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
527 |
uint num = 0; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
528 |
struct stat sb; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
529 |
struct dirent *dirent; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
530 |
DIR *dir; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
531 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
532 |
if (path == NULL || (dir = ttd_opendir(path)) == NULL) return 0; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
533 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
534 |
while ((dirent = readdir(dir)) != NULL) { |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
535 |
const char *d_name = FS2OTTD(dirent->d_name); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
536 |
char filename[MAX_PATH]; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
537 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
538 |
if (!FiosIsValidFile(path, dirent, &sb)) continue; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
539 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
540 |
snprintf(filename, lengthof(filename), "%s%s", path, d_name); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
541 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
542 |
if (sb.st_mode & S_IFDIR) { |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
543 |
/* Directory */ |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
544 |
if (strcmp(d_name, ".") == 0 || strcmp(d_name, "..") == 0) continue; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
545 |
AppendPathSeparator(filename, lengthof(filename)); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
546 |
num += ScanPathForTarFiles(filename, basepath_length); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
547 |
} else if (sb.st_mode & S_IFREG) { |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
548 |
/* File */ |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
549 |
char *ext = strrchr(filename, '.'); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
550 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
551 |
/* If no extension or extension isn't .tar, skip the file */ |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
552 |
if (ext == NULL) continue; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
553 |
if (strcasecmp(ext, ".tar") != 0) continue; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
554 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
555 |
if (TarListAddFile(filename)) num++; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
556 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
557 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
558 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
559 |
closedir(dir); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
560 |
return num; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
561 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
562 |
|
8085
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
563 |
void ScanForTarFiles() |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
564 |
{ |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
565 |
Searchpath sp; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
566 |
char path[MAX_PATH]; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
567 |
uint num = 0; |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
568 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
569 |
DEBUG(misc, 1, "Scanning for tars"); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
570 |
FOR_ALL_SEARCHPATHS(sp) { |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
571 |
FioAppendDirectory(path, MAX_PATH, sp, DATA_DIR); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
572 |
num += ScanPathForTarFiles(path, strlen(path)); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
573 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
574 |
DEBUG(misc, 1, "Scan complete, found %d files", num); |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
575 |
} |
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
576 |
|
8085
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
577 |
#if defined(WIN32) || defined(WINCE) |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
578 |
/** |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
579 |
* Determine the base (personal dir and game data dir) paths |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
580 |
* @param exe the path from the current path to the executable |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
581 |
* @note defined in the OS related files (os2.cpp, win32.cpp, unix.cpp etc) |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
582 |
*/ |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
583 |
extern void DetermineBasePaths(const char *exe); |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
584 |
#else /* defined(WIN32) || defined(WINCE) */ |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
585 |
|
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
586 |
/** |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
587 |
* Changes the working directory to the path of the give executable. |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
588 |
* For OSX application bundles '.app' is the required extension of the bundle, |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
589 |
* so when we crop the path to there, when can remove the name of the bundle |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
590 |
* in the same way we remove the name from the executable name. |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
591 |
* @param exe the path to the executable |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
592 |
*/ |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
593 |
void ChangeWorkingDirectory(const char *exe) |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
594 |
{ |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
595 |
#ifdef WITH_COCOA |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
596 |
char *app_bundle = strchr(exe, '.'); |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
597 |
while (app_bundle != NULL && strncasecmp(app_bundle, ".app", 4) != 0) app_bundle = strchr(&app_bundle[1], '.'); |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
598 |
|
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
599 |
if (app_bundle != NULL) app_bundle[0] = '\0'; |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
600 |
#endif /* WITH_COCOA */ |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
601 |
char *s = strrchr(exe, PATHSEPCHAR); |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
602 |
if (s != NULL) { |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
603 |
*s = '\0'; |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
604 |
chdir(exe); |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
605 |
*s = PATHSEPCHAR; |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
606 |
} |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
607 |
#ifdef WITH_COCOA |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
608 |
if (app_bundle != NULL) app_bundle[0] = '.'; |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
609 |
#endif /* WITH_COCOA */ |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
610 |
} |
698efbcb33de
(svn r11116) -Fix (r11106): tar loader was not compiled for WIN32
glx
parents:
8080
diff
changeset
|
611 |
|
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
612 |
/** |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
613 |
* Determine the base (personal dir and game data dir) paths |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
614 |
* @param exe the path to the executable |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
615 |
*/ |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
616 |
void DetermineBasePaths(const char *exe) |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
617 |
{ |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
618 |
char tmp[MAX_PATH]; |
7486
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
619 |
#if defined(__MORPHOS__) || defined(__AMIGA__) || !defined(WITH_PERSONAL_DIR) |
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
620 |
_searchpaths[SP_PERSONAL_DIR] = NULL; |
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
621 |
#else |
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
622 |
const char *homedir = getenv("HOME"); |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
623 |
|
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
624 |
if (homedir == NULL) { |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
625 |
const struct passwd *pw = getpwuid(getuid()); |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
626 |
homedir = (pw == NULL) ? "" : pw->pw_dir; |
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
627 |
} |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
628 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
629 |
snprintf(tmp, MAX_PATH, "%s" PATHSEP "%s", homedir, PERSONAL_DIR); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
630 |
AppendPathSeparator(tmp, MAX_PATH); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
631 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
632 |
_searchpaths[SP_PERSONAL_DIR] = strdup(tmp); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
633 |
#endif |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
634 |
_searchpaths[SP_SHARED_DIR] = NULL; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
635 |
|
7486
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
636 |
#if defined(__MORPHOS__) || defined(__AMIGA__) |
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
637 |
_searchpaths[SP_WORKING_DIR] = NULL; |
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
638 |
#else |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
639 |
getcwd(tmp, MAX_PATH); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
640 |
AppendPathSeparator(tmp, MAX_PATH); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
641 |
_searchpaths[SP_WORKING_DIR] = strdup(tmp); |
7486
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
642 |
#endif |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
643 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
644 |
/* Change the working directory to that one of the executable */ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
645 |
ChangeWorkingDirectory((char*)exe); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
646 |
getcwd(tmp, MAX_PATH); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
647 |
AppendPathSeparator(tmp, MAX_PATH); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
648 |
_searchpaths[SP_BINARY_DIR] = strdup(tmp); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
649 |
|
7486
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
650 |
#if defined(__MORPHOS__) || defined(__AMIGA__) |
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
651 |
_searchpaths[SP_INSTALLATION_DIR] = NULL; |
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
652 |
#else |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
653 |
snprintf(tmp, MAX_PATH, "%s", GLOBAL_DATA_DIR); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
654 |
AppendPathSeparator(tmp, MAX_PATH); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
655 |
_searchpaths[SP_INSTALLATION_DIR] = strdup(tmp); |
7486
d130c10f4dab
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
7437
diff
changeset
|
656 |
#endif |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
657 |
#ifdef WITH_COCOA |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
658 |
extern void cocoaSetApplicationBundleDir(); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
659 |
cocoaSetApplicationBundleDir(); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
660 |
#else |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
661 |
_searchpaths[SP_APPLICATION_BUNDLE_DIR] = NULL; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
662 |
#endif |
8077
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
663 |
|
92edb3688fdf
(svn r11106) -Add: added .tar support; you can pack all files in your data/ dir in how ever many .tar files you like, keeping the dir-structure equal to the unpacked version, and OpenTTD can handle them just like the files were unpacked
truelight
parents:
8071
diff
changeset
|
664 |
ScanForTarFiles(); |
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
665 |
} |
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
666 |
#endif /* defined(WIN32) || defined(WINCE) */ |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
667 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
668 |
char *_personal_dir; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
669 |
|
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
670 |
/** |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
671 |
* Acquire the base paths (personal dir and game data dir), |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
672 |
* fill all other paths (save dir, autosave dir etc) and |
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
673 |
* make the save and scenario directories. |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
674 |
* @param exe the path from the current path to the executable |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
675 |
*/ |
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
676 |
void DeterminePaths(const char *exe) |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
677 |
{ |
6643
7fad81bde617
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6625
diff
changeset
|
678 |
DetermineBasePaths(exe); |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
679 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
680 |
Searchpath sp; |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
681 |
FOR_ALL_SEARCHPATHS(sp) DEBUG(misc, 4, "%s added as search path", _searchpaths[sp]); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
682 |
|
7437
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
683 |
if (_config_file != NULL) { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
684 |
_personal_dir = strdup(_config_file); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
685 |
char *end = strrchr(_personal_dir , PATHSEPCHAR); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
686 |
if (end == NULL) { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
687 |
_personal_dir[0] = '\0'; |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
688 |
} else { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
689 |
end[1] = '\0'; |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
690 |
} |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
691 |
} else { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
692 |
char personal_dir[MAX_PATH]; |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
693 |
FioFindFullPath(personal_dir, lengthof(personal_dir), BASE_DIR, "openttd.cfg"); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
694 |
|
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
695 |
if (FileExists(personal_dir)) { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
696 |
char *end = strrchr(personal_dir, PATHSEPCHAR); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
697 |
if (end != NULL) end[1] = '\0'; |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
698 |
_personal_dir = strdup(personal_dir); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
699 |
_config_file = str_fmt("%sopenttd.cfg", _personal_dir); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
700 |
} else { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
701 |
static const Searchpath new_openttd_cfg_order[] = { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
702 |
SP_PERSONAL_DIR, SP_BINARY_DIR, SP_WORKING_DIR, SP_SHARED_DIR, SP_INSTALLATION_DIR |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
703 |
}; |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
704 |
|
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
705 |
for (uint i = 0; i < lengthof(new_openttd_cfg_order); i++) { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
706 |
if (IsValidSearchPath(new_openttd_cfg_order[i])) { |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
707 |
_personal_dir = strdup(_searchpaths[new_openttd_cfg_order[i]]); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
708 |
_config_file = str_fmt("%sopenttd.cfg", _personal_dir); |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
709 |
break; |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
710 |
} |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
711 |
} |
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
712 |
} |
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
713 |
} |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
714 |
|
7437
3479a4c141b5
(svn r10194) -Codechange: prefer the current working directory above the user's home directory when openttd.cfg exists in the current working directory, otherwise prefer the home directory.
rubidium
parents:
7431
diff
changeset
|
715 |
DEBUG(misc, 3, "%s found as personal directory", _personal_dir); |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
716 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
717 |
_highscore_file = str_fmt("%shs.dat", _personal_dir); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
718 |
_log_file = str_fmt("%sopenttd.log", _personal_dir); |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
719 |
|
7425
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
720 |
char *save_dir = str_fmt("%s%s", _personal_dir, FioGetSubdirectory(SAVE_DIR)); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
721 |
char *autosave_dir = str_fmt("%s%s", _personal_dir, FioGetSubdirectory(AUTOSAVE_DIR)); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
722 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
723 |
/* Make the necessary folders */ |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
724 |
FioCreateDirectory(_personal_dir); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
725 |
FioCreateDirectory(save_dir); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
726 |
FioCreateDirectory(autosave_dir); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
727 |
|
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
728 |
free(save_dir); |
350b9265b7a2
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
7392
diff
changeset
|
729 |
free(autosave_dir); |
6624
554e5aee6c3f
(svn r9129) -Codechange: unify parts of DeterminePaths.
rubidium
parents:
6574
diff
changeset
|
730 |
} |
7371
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
731 |
|
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
732 |
/** |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
733 |
* Sanitizes a filename, i.e. removes all illegal characters from it. |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
734 |
* @param filename the "\0" terminated filename |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
735 |
*/ |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
736 |
void SanitizeFilename(char *filename) |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
737 |
{ |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
738 |
for (; *filename != '\0'; filename++) { |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
739 |
switch (*filename) { |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
740 |
/* The following characters are not allowed in filenames |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
741 |
* on at least one of the supported operating systems: */ |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
742 |
case ':': case '\\': case '*': case '?': case '/': |
7512
7889a88184c0
(svn r10272) -Fix (FS#916): remove more invalid characters from savegame names
glx
parents:
7486
diff
changeset
|
743 |
case '<': case '>': case '|': case '"': |
7371
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
744 |
*filename = '_'; |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
745 |
break; |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
746 |
} |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
747 |
} |
b86b05214afe
(svn r10116) -Fix [FS#850]: remove invalid characters (for the file system) from savegame names. Based on a patch by TheJosh.
rubidium
parents:
7330
diff
changeset
|
748 |
} |