Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 |
diff --git a/apps/metadata/mod.c b/apps/metadata/mod.c index dbedc6e..d7c5d87 100644 * ****************************************************************************/ #include <stdio.h> -#include <string.h> #include <stdlib.h> #include <ctype.h> #include <inttypes.h> #include "system.h" +#include "string-extra.h" #include "metadata.h" #include "metadata_common.h" #include "metadata_parsers.h" #include "rbunicode.h" +#define MAGIC_OFFSET (0x438) bool get_mod_metadata(int fd, struct mp3entry* id3) -{ +{ /* Use the trackname part of the id3 structure as a temporary buffer */ - unsigned char buf[1084]; + unsigned char buf[0x34C]; int read_bytes; char *p; if ((lseek(fd, 0, SEEK_SET) < 0) - || ((read_bytes = read(fd, buf, sizeof(buf))) < 1084)) + || ((read_bytes = read(fd, buf, sizeof(buf))) < (ssize_t)sizeof(buf))) + { + return false; + } + + /* is it a .mod file ? + * if we don't find the magic, we need some \0 bytes or + * the code below will fail */ + if (memcmp(&buf[MAGIC_OFFSET], "M.K.", 4) && + memcmp(&buf[MAGIC_OFFSET], "M!K!", 4) && + memchr(buf, '\0', sizeof(buf)) == NULL) { return false; } - - /* We don't do file format checking here - * There can be .mod files without any signatures out there */ p = id3->id3v2buf; - + /* Copy Title */ - strcpy(p, &buf[0x00]); + strlcpy(p, &buf[0x00], sizeof(id3->id3v2buf)); id3->title = p; - p += strlen(p)+1; id3->bitrate = filesize(fd)/1024; /* size in kb */ id3->frequency = 44100; id3->length = 120*1000; id3->vbr = false; id3->filesize = filesize(fd); - return true; } diff --git a/apps/tagcache.c b/apps/tagcache.c index 3565d8e..4588dbb 100644 #include <stdio.h> #include <stdlib.h> #include <ctype.h> +#ifdef APPLICATION +#include <errno.h> +#include <unistd.h> +#include <sys/stat.h> /* lstat() */ +#endif #include "config.h" #include "ata_idle_notify.h" #include "thread.h" #include "dir.h" #include "filefuncs.h" #include "structec.h" +#include "debug.h" +#define logf(...) do { debugf(__VA_ARGS__); debugf("\n"); } while(0) #ifndef __PCTOOL__ #include "lang.h" #include "eeprom_settings.h" static void __attribute__ ((noinline)) check_ignore(const char *dirname, *unignore = file_exists(newpath); } +static struct search_roots_ll { + const char * path; + struct search_roots_ll * next; +} roots_ll; + +#ifdef APPLICATION +static bool add_search_root(const char *name) +{ + struct search_roots_ll * this, *prev = NULL; + char target[MAX_PATH]; + char _abs_target[MAX_PATH]; + char * abs_target; + ssize_t len; + + len = readlink(name, target, sizeof(target)); + if (len < 0) + return false; + target[len] = '\0'; + + /* realpath(target, NULL) doesn't work on android ... */ + abs_target = realpath(target, _abs_target); + if (abs_target == NULL) + return false; + + if (!strcmp("/", abs_target)) + printf("link to /: %s (%s)\n", name, target); + for(this = &roots_ll; this; prev = this, this = this->next) + { + size_t root_len = strlen(this->path); + /* check if the link target is inside of an existing search root + * don't add if target is inside, we'll scan it later + * + * don't bother if / is in the search roots */ + printf("Checking %s against %s\n", abs_target, this->path); + if (!strncmp(this->path, abs_target, root_len)) + goto fail; + } + + if (prev) + { + prev->next = malloc(sizeof(struct search_roots_ll)); + this = prev->next; + this->path = strdup(abs_target); + printf("Added: %s\n", abs_target); + this->next = NULL; + return true; + } +fail: + return false; +} + +static int free_search_roots(struct search_roots_ll * start) +{ + int ret = 0; + if (start->next) + { + ret += free_search_roots(start->next); + ret += sizeof(struct search_roots_ll); + free(start->next); + } + ret += strlen(start->path)+1; + free((void*)start->path); + return ret; +} +#endif static bool check_dir(const char *dirname, int add_files) { static bool check_dir(const char *dirname, int add_files) logf("tagcache: opendir(%s) failed", dirname); return false; } - /* check for a database.ignore and database.unignore */ check_ignore(dirname, &ignore, &unignore); static bool check_dir(const char *dirname, int add_files) while (!check_event_queue()) #endif { - struct dirent *entry; - - entry = readdir(dir); - + struct dirent *entry = readdir(dir); if (entry == NULL) { success = true; - break ; + break; } - struct dirinfo info = dir_get_info(dir, entry); - if (!strcmp((char *)entry->d_name, ".") || !strcmp((char *)entry->d_name, "..")) + { continue; + } + + struct dirinfo info = dir_get_info(dir, entry); yield(); len = strlen(curpath); - snprintf(&curpath[len], sizeof(curpath) - len, "/%s", - entry->d_name); - + if (len <= 1) + len = 0; + snprintf(&curpath[len], sizeof(curpath) - len, "/%s", entry->d_name); + processed_dir_count++; if (info.attribute & ATTR_DIRECTORY) - check_dir(curpath, add_files); + { +#ifdef APPLICATION + if (info.attribute & ATTR_LINK) + { /* don't follow symlinks to dirs */ + if (!strcmp("/", curpath)) + { + printf("grr %s;%s (entry: %s)\n", curpath, dirname, entry->d_name); + } + add_search_root(curpath); + } + else +#endif + check_dir(curpath, add_files); + } else if (add_files) { tc_stat.curentry = curpath; void tagcache_build(const char *path) memset(&header, 0, sizeof(struct tagcache_header)); write(cachefd, &header, sizeof(struct tagcache_header)); - if (strcmp("/", path) != 0) - strcpy(curpath, path); - ret = check_dir(path, true); - + ret = true; + roots_ll.path = path; + roots_ll.next = NULL; + struct search_roots_ll * this; + /* check_dir might add new roots */ + for(this = &roots_ll; this; this = this->next) + { + strcpy(curpath, this->path); + ret = ret && check_dir(this->path, true); + } +#ifdef APPLICATION + if (roots_ll.next) + printf("freed %d bytes\n", free_search_roots(roots_ll.next)); +#endif /* Write the header. */ header.magic = TAGCACHE_MAGIC; header.datasize = data_size; diff --git a/firmware/export/system.h b/firmware/export/system.h index 4a5dcf0..d7f5c95 100644 #ifndef __SYSTEM_H__ #define __SYSTEM_H__ +#include "config.h" #include "cpu.h" #include "stdbool.h" #include "kernel.h" enum { #endif #ifdef NEED_GENERIC_BYTESWAPS +#undef swap16 static inline uint16_t swap16(uint16_t value) /* result[15..8] = value[ 7..0]; static inline uint16_t swap16(uint16_t value) { return (value >> 8) | (value << 8); } - +#undef swap32 static inline uint32_t swap32(uint32_t value) /* result[31..24] = value[ 7.. 0]; diff --git a/firmware/include/dir.h b/firmware/include/dir.h index 3a582c3..4f19931 100644 #define ATTR_DIRECTORY 0x10 #define ATTR_ARCHIVE 0x20 #define ATTR_VOLUME 0x40 /* this is a volume, not a real directory */ +#define ATTR_LINK 0x80 #ifdef HAVE_DIRCACHE # include "dircache.h" diff --git a/firmware/target/hosted/android/fs-android.c b/firmware/target/hosted/android/fs-android.c index 1967198..c6d22a4 100644 struct dirinfo dir_get_info(struct DIR* _parent, struct dirent *dir) { struct __dir *parent = (struct __dir*)_parent; struct stat s; - struct tm *tm; + struct tm *tm = NULL; struct dirinfo ret; char path[MAX_PATH]; snprintf(path, sizeof(path), "%s/%s", parent->path, dir->d_name); - stat(path, &s); memset(&ret, 0, sizeof(ret)); - if (S_ISDIR(s.st_mode)) + if (!stat(path, &s)) { - ret.attribute = ATTR_DIRECTORY; + if (S_ISDIR(s.st_mode)) + { + ret.attribute = ATTR_DIRECTORY; + } + ret.size = s.st_size; + tm = localtime(&(s.st_mtime)); + } + + if (!lstat(path, &s) && S_ISLNK(s.st_mode)) + { + ret.attribute |= ATTR_LINK; + } + + if (tm) + { + ret.wrtdate = ((tm->tm_year - 80) << 9) | + ((tm->tm_mon + 1) << 5) | + tm->tm_mday; + ret.wrttime = (tm->tm_hour << 11) | + (tm->tm_min << 5) | + (tm->tm_sec >> 1); } - ret.size = s.st_size; - tm = localtime(&(s.st_mtime)); - ret.wrtdate = ((tm->tm_year - 80) << 9) | - ((tm->tm_mon + 1) << 5) | - tm->tm_mday; - ret.wrttime = (tm->tm_hour << 11) | - (tm->tm_min << 5) | - (tm->tm_sec >> 1); return ret; } diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 3321a01..41fc281 100644 void gui_message_loop(void) do { /* wait for the next event */ while(SDL_WaitEvent(&event) == 0) + { printf("SDL_WaitEvent() error\n"); + exit(EXIT_FAILURE); + } sim_enter_irq_handler(); quit = event_handler(&event); diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c index fe7bad4..56abf4b 100644 #include "config.h" #define HAVE_STATVFS (!defined(WIN32)) +#define HAVE_LSTAT (!defined(WIN32)) #if HAVE_STATVFS #include <sys/statvfs.h> struct sim_dirent *sim_readdir(MYDIR *dir) static struct sim_dirent secret; STAT_T s; DIRENT_T *x11 = READDIR(dir->dir); - struct tm* tm; + struct tm tm; if(!x11) return (struct sim_dirent *)0; struct sim_dirent *sim_readdir(MYDIR *dir) /* build file name */ snprintf(buffer, sizeof(buffer), "%s/%s", get_sim_pathname(dir->name), secret.d_name); - STAT(buffer, &s); /* get info */ + if (STAT(buffer, &s)) /* get info */ + return NULL; #define ATTR_DIRECTORY 0x10 - secret.info.attribute = S_ISDIR(s.st_mode)?ATTR_DIRECTORY:0; + secret.info.attribute = 0; + + if (S_ISDIR(s.st_mode)) + secret.info.attribute = ATTR_DIRECTORY; + secret.info.size = s.st_size; + + if (localtime_r(&(s.st_mtime), &tm) == NULL) + return NULL; + secret.info.wrtdate = ((tm.tm_year - 80) << 9) | + ((tm.tm_mon + 1) << 5) | + tm.tm_mday; + secret.info.wrttime = (tm.tm_hour << 11) | + (tm.tm_min << 5) | + (tm.tm_sec >> 1); + +#ifdef HAVE_LSTAT +#define ATTR_LINK 0x80 + if (!lstat(buffer, &s) && S_ISLNK(s.st_mode)) + { + secret.info.attribute |= ATTR_LINK; + } +#endif - tm = localtime(&(s.st_mtime)); - secret.info.wrtdate = ((tm->tm_year - 80) << 9) | - ((tm->tm_mon + 1) << 5) | - tm->tm_mday; - secret.info.wrttime = (tm->tm_hour << 11) | - (tm->tm_min << 5) | - (tm->tm_sec >> 1); return &secret; } |
