Update ralloc, fix invalid c++ names

include/bits/stdio.h

@@ -1,6 +1,8 @@
 #ifndef _BITS_STDIO_H
 #define _BITS_STDIO_H
 
+#define EOF (-1)
+
 int fprintf(FILE * stream, const char * fmt, ...);
 int printf(const char * fmt, ...);
 int snprintf(char *s, size_t n, const char * fmt, ...);

ralloc

@@ -1 +1 @@
-Subproject commit 25ac80dd96c7fc0a7116068a74abe1c86102f7e8
+Subproject commit 2d8d44970eb5bb2ecc55f5ced8a33f21ed9407f4

src/platform/src/redox/mod.rs

@@ -265,11 +265,11 @@ pub fn read(fd: c_int, buf: &mut [u8]) -> ssize_t {
     e(syscall::read(fd as usize, buf)) as ssize_t
 }
 
-pub fn rename(old: *const c_char, new: *const c_char) -> c_int {
-    let (old_path, new_path) = unsafe { (c_str(old), c_str(new)) };
-    match syscall::open(old_path, O_WRONLY) {
+pub fn rename(oldpath: *const c_char, newpath: *const c_char) -> c_int {
+    let (oldpath, newpath) = unsafe { (c_str(oldpath), c_str(newpath)) };
+    match syscall::open(oldpath, O_WRONLY) {
         Ok(fd) => {
-            let retval = syscall::frename(fd, new_path);
+            let retval = syscall::frename(fd, newpath);
             let _ = syscall::close(fd);
             e(retval) as c_int
         }

src/stdio/src/lib.rs

@@ -760,8 +760,8 @@ pub extern "C" fn remove(path: *const c_char) -> c_int {
 }
 
 #[no_mangle]
-pub extern "C" fn rename(old: *const c_char, new: *const c_char) -> c_int {
-    platform::rename(old, new)
+pub extern "C" fn rename(oldpath: *const c_char, newpath: *const c_char) -> c_int {
+    platform::rename(oldpath, newpath)
 }
 
 /// Rewind `stream` back to the beginning of it

src/stdlib/src/lib.rs

@@ -354,12 +354,12 @@ pub extern "C" fn mbtowc(pwc: *mut wchar_t, s: *const c_char, n: size_t) -> c_in
 }
 
 #[no_mangle]
-pub extern "C" fn mktemp(template: *mut c_char) -> *mut c_char {
+pub extern "C" fn mktemp(name: *mut c_char) -> *mut c_char {
     unimplemented!();
 }
 
 #[no_mangle]
-pub extern "C" fn mkstemp(template: *mut c_char) -> c_int {
+pub extern "C" fn mkstemp(name: *mut c_char) -> c_int {
     unimplemented!();
 }
 

tests/rename.c

@@ -3,22 +3,22 @@
 #include <string.h>
 #include <unistd.h>
 
-static char old[] = "old-name.out";
-static char new[] = "new-name.out";
+static char oldpath[] = "old-name.out";
+static char newpath[] = "new-name.out";
 static char str[] = "Hello, World!";
 int str_len = 13;
 
 int main() {
     char buf[14];
     buf[13] = 0x00;
-    int fd = creat(old, 0777);
+    int fd = creat(oldpath, 0777);
     write(fd, str, str_len);
     close(fd);
-    rename(old, new);
-    fd = open(new, O_RDONLY);
+    rename(oldpath, newpath);
+    fd = open(newpath, O_RDONLY);
     read(fd, buf, str_len);
     close(fd);
-    remove(new);
+    remove(newpath);
     if (strcmp(str, buf) == 0) {
         return 0;
     } else {