Commit ba8025fc authored Jan 01, 2025 by Chris Friedt Committed by Henrik Brix Andersen Jan 05, 2025

newlib: correct signature of _open() for xtensa

Previously, in libc-hooks.c, the signature of `_open()` was as
shown below.

```cpp
int _open(const char *name, int mode);
```

This conflicted with the signature of `_open()` from newlib,
which is

```cpp
int _open(const char *name, int flags, ...);
```

Moreover, the mode and flags field were reversed, but only for
the Xtensa architecture due to the `_open_r()` hook that is
present in `libc-hooks.c`.

This manifested itself via a call to `fopen(file, "w+")`, where
the expected flags should include `O_CREAT | O_TRUNC`, or
`0x200 | 0x400`. Instead, the unexpected flags passed to the
underlying `zvfs_open()` call were `0x1b6`.

This change corrects the function signature and order of the
arguments.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>

parent 4d60f0a5

lib/libc/newlib/libc-hooks.c

+3 −3

Changes for lib/libc/newlib/libc-hooks.c: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@
		int _fstat(int fd, struct stat *st);
		int _read(int fd, void *buf, int nbytes);
		int _write(int fd, const void *buf, int nbytes);
		int _open(const char *name, int mode);
		int _open(const char *name, int flags, ...);
		int _close(int file);
		int _lseek(int file, int ptr, int dir);
		int _kill(int pid, int sig);
		@@ -239,7 +239,7 @@ int _write(int fd, const void *buf, int nbytes)
		}
		__weak FUNC_ALIAS(_write, write, int);

		int _open(const char *name, int mode)
		int _open(const char *name, int flags, ...)
		{
		return -1;
		}
		@@ -518,7 +518,7 @@ int _open_r(struct _reent r, const char name, int flags, int mode)
		ARG_UNUSED(r);
		ARG_UNUSED(flags);

		return _open(name, mode);
		return _open(name, flags, mode);
		}

		int _close_r(struct _reent *r, int file)

Admin message