Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-26 20:40:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* libmisc/shell/main_dd.c: Make symbol unique to avoid conflict with
	same name in <sys/stat.h>.
This commit is contained in:
Joel Sherrill
2011-01-17 23:05:36 +00:00
parent a0cd082999
commit 2946682d59
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/main_dd.c: Make symbol unique to avoid conflict with
same name in <sys/stat.h>.
2011-01-17 Alin Rus <alin.codejunkie@gmail.com>
* posix/src/aio_cancel.c: Fixed ending of if braces.
cpukit/libmisc/shell/main_dd.c
+3 -3
View File
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
#include "dd.h"
#include "extern-dd.h"
#define DEFFILEMODE 0
#define DD_DEFFILEMODE 0
static void dd_close(rtems_shell_dd_globals* globals);
static void dd_in(rtems_shell_dd_globals* globals);
@@ -194,14 +194,14 @@ setup(rtems_shell_dd_globals* globals)
} else {
#define OFLAGS \
(O_CREAT | (ddflags & (C_SEEK | C_NOTRUNC) ? 0 : O_TRUNC))
out.fd = open(out.name, O_RDWR | OFLAGS, DEFFILEMODE);
out.fd = open(out.name, O_RDWR | OFLAGS, DD_DEFFILEMODE);
/*
* May not have read access, so try again with write only.
* Without read we may have a problem if output also does
* not support seeks.
*/
if (out.fd == -1) {
out.fd = open(out.name, O_WRONLY | OFLAGS, DEFFILEMODE);
out.fd = open(out.name, O_WRONLY | OFLAGS, DD_DEFFILEMODE);
out.flags |= NOREAD;
}
if (out.fd == -1)