diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 17:35:13 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 17:35:13 +0000 |
| commit | 0a1d7c28b7e9da555d26d489cde2da26e2cc9ca0 (patch) | |
| tree | a21521e6e4b8fe0131c4d9e8bae6d8cc78125fe9 /apps/plugins/rockboy | |
| parent | c61e89c0eda126c2c1a4a3983520c35fe30db156 (diff) | |
| download | rockbox-0a1d7c28b7e9da555d26d489cde2da26e2cc9ca0.zip rockbox-0a1d7c28b7e9da555d26d489cde2da26e2cc9ca0.tar.gz rockbox-0a1d7c28b7e9da555d26d489cde2da26e2cc9ca0.tar.bz2 rockbox-0a1d7c28b7e9da555d26d489cde2da26e2cc9ca0.tar.xz | |
Make open() posix compliant api-wise. A few calls (those with O_CREAT) need the additional optional mode parameter so add it. Impact for the core is almost zero, as open() is a wrapper macro for the real open function which doesn't take the variable parameter.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25844 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockboy')
| -rw-r--r-- | apps/plugins/rockboy/cpu.c | 2 | ||||
| -rw-r--r-- | apps/plugins/rockboy/dynarec.c | 4 | ||||
| -rw-r--r-- | apps/plugins/rockboy/loader.c | 4 | ||||
| -rw-r--r-- | apps/plugins/rockboy/menu.c | 2 | ||||
| -rw-r--r-- | apps/plugins/rockboy/rockboy.c | 2 | ||||
| -rw-r--r-- | apps/plugins/rockboy/rockmacros.h | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/apps/plugins/rockboy/cpu.c b/apps/plugins/rockboy/cpu.c index 2fc7411..e1d1324 100644 --- a/apps/plugins/rockboy/cpu.c +++ b/apps/plugins/rockboy/cpu.c @@ -947,7 +947,7 @@ next: int fd; blockcount++; snprintf(meow,499,"/dyna_0x%x_run.rb",PC); - fd=open(meow,O_WRONLY|O_CREAT|O_TRUNC); + fd=open(meow,O_WRONLY|O_CREAT|O_TRUNC, 0666); if(fd>=0) { fdprintf(fd,"Block 0x%x Blockcount: %d\n",PC,blockcount); diff --git a/apps/plugins/rockboy/dynarec.c b/apps/plugins/rockboy/dynarec.c index afe6caa..3c71115 100644 --- a/apps/plugins/rockboy/dynarec.c +++ b/apps/plugins/rockboy/dynarec.c @@ -425,7 +425,7 @@ void dynamic_recompile (struct dynarec_block *newblock) newblock->block=dynapointer; #ifdef DYNA_DEBUG snprintf(meow,499,"/dyna_0x%x_asm.rb",PC); - fd=open(meow,O_WRONLY|O_CREAT|O_TRUNC); + fd=open(meow,O_WRONLY|O_CREAT|O_TRUNC, 0666); if(fd<0) { die("couldn't open dyna debug file"); @@ -1907,7 +1907,7 @@ void dynamic_recompile (struct dynarec_block *newblock) newblock->length=dynapointer-newblock->block; IF_COP(rb->cpucache_invalidate()); snprintf(meow,499,"/dyna_0x%x_code.rb",PC); - fd=open(meow,O_WRONLY|O_CREAT|O_TRUNC); + fd=open(meow,O_WRONLY|O_CREAT|O_TRUNC, 0666); if(fd>=0) { write(fd,newblock->block,newblock->length); diff --git a/apps/plugins/rockboy/loader.c b/apps/plugins/rockboy/loader.c index 71ab4e7..e92b7d0 100644 --- a/apps/plugins/rockboy/loader.c +++ b/apps/plugins/rockboy/loader.c @@ -249,7 +249,7 @@ static int sram_save(void) /* If we crash before we ever loaded sram, DO NOT SAVE! */ if (!mbc.batt || !ram.loaded || !mbc.ramsize) return -1; - fd = open(sramfile, O_WRONLY|O_CREAT|O_TRUNC); + fd = open(sramfile, O_WRONLY|O_CREAT|O_TRUNC, 0666); if (fd<0) return -1; snprintf(meow,499,"Saving savedata to %s",sramfile); rb->splash(HZ*2, meow); @@ -263,7 +263,7 @@ static void rtc_save(void) { int fd; if (!rtc.batt) return; - if ((fd = open(rtcfile, O_WRONLY|O_CREAT|O_TRUNC))<0) return; + if ((fd = open(rtcfile, O_WRONLY|O_CREAT|O_TRUNC, 0666))<0) return; rtc_save_internal(fd); close(fd); } diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index 710a476..2f6c310 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c @@ -178,7 +178,7 @@ static bool do_file(char *path, char *desc, bool is_load) { file_mode = is_load ? O_RDONLY : (O_WRONLY | O_CREAT); /* attempt to open file descriptor here */ - if ((fd = open(path, file_mode)) < 0) + if ((fd = open(path, file_mode, 0666)) < 0) return false; /* load/save state */ diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index ba60b14..ec224a2 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -325,7 +325,7 @@ static void savesettings(void) { options.dirty=0; snprintf(optionsave, sizeof(optionsave), "%s/%s", savedir, optionname); - fd = open(optionsave, O_WRONLY|O_CREAT|O_TRUNC); + fd = open(optionsave, O_WRONLY|O_CREAT|O_TRUNC, 0666); write(fd,&options, sizeof(options)); close(fd); } diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h index 0fd13f6..e7f79a5 100644 --- a/apps/plugins/rockboy/rockmacros.h +++ b/apps/plugins/rockboy/rockmacros.h @@ -59,7 +59,9 @@ void dynamic_recompile (struct dynarec_block *newblock); #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) #define isalnum(c) (isdigit(c) || (isalpha(c))) -#define open(a,b) rb->open((a),(b)) +/* only 1 fixed argument for open, since variadic macros don't except empty + * variable parameters */ +#define open(a, ...) rb->open((a), __VA_ARGS__) #define lseek(a,b,c) rb->lseek((a),(b),(c)) #define close(a) rb->close((a)) #define read(a,b,c) rb->read((a),(b),(c)) |