projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2008-11-20 Jb Evain <jbevain@novell.com>
[mono.git]
/
support
/
unistd.c
diff --git
a/support/unistd.c
b/support/unistd.c
index c8b71ab74cd5d37f500097244ddc4a66c5a9bdce..209c0c1c450c1bae02b7fec90dbdcae168d1d94c 100644
(file)
--- a/
support/unistd.c
+++ b/
support/unistd.c
@@
-4,7
+4,7
@@
* Authors:
* Jonathan Pryor (jonpryor@vt.edu)
*
* Authors:
* Jonathan Pryor (jonpryor@vt.edu)
*
- * Copyright (C) 2004 Jonathan Pryor
+ * Copyright (C) 2004
-2006
Jonathan Pryor
*/
#ifndef _GNU_SOURCE
*/
#ifndef _GNU_SOURCE
@@
-27,11
+27,7
@@
G_BEGIN_DECLS
mph_off_t
Mono_Posix_Syscall_lseek (gint32 fd, mph_off_t offset, gint32 whence)
{
mph_off_t
Mono_Posix_Syscall_lseek (gint32 fd, mph_off_t offset, gint32 whence)
{
- short _whence;
mph_return_if_off_t_overflow (offset);
mph_return_if_off_t_overflow (offset);
- if (Mono_Posix_FromSeekFlags (whence, &_whence) == -1)
- return -1;
- whence = _whence;
return lseek (fd, offset, whence);
}
return lseek (fd, offset, whence);
}
@@
-44,7
+40,7
@@
Mono_Posix_Syscall_read (gint32 fd, void *buf, mph_size_t count)
}
mph_ssize_t
}
mph_ssize_t
-Mono_Posix_Syscall_write (gint32 fd,
const
void *buf, mph_size_t count)
+Mono_Posix_Syscall_write (gint32 fd, void *buf, mph_size_t count)
{
mph_return_if_size_t_overflow (count);
return write (fd, buf, (size_t) count);
{
mph_return_if_size_t_overflow (count);
return write (fd, buf, (size_t) count);
@@
-60,7
+56,7
@@
Mono_Posix_Syscall_pread (gint32 fd, void *buf, mph_size_t count, mph_off_t offs
}
mph_ssize_t
}
mph_ssize_t
-Mono_Posix_Syscall_pwrite (gint32 fd,
const
void *buf, mph_size_t count, mph_off_t offset)
+Mono_Posix_Syscall_pwrite (gint32 fd, void *buf, mph_size_t count, mph_off_t offset)
{
mph_return_if_size_t_overflow (count);
mph_return_if_off_t_overflow (offset);
{
mph_return_if_size_t_overflow (count);
mph_return_if_off_t_overflow (offset);
@@
-86,7
+82,7
@@
Mono_Posix_Syscall_pipe (gint32 *reading, gint32 *writing)
return r;
}
return r;
}
-
char
*
+
void
*
Mono_Posix_Syscall_getcwd (char *buf, mph_size_t size)
{
mph_return_val_if_size_t_overflow (size, NULL);
Mono_Posix_Syscall_getcwd (char *buf, mph_size_t size)
{
mph_return_val_if_size_t_overflow (size, NULL);
@@
-94,34
+90,37
@@
Mono_Posix_Syscall_getcwd (char *buf, mph_size_t size)
}
gint64
}
gint64
-Mono_Posix_Syscall_fpathconf (int filedes, int name)
+Mono_Posix_Syscall_fpathconf (int filedes, int name
, int defaultError
)
{
{
- if (Mono_Posix_FromPathConf (name, &name) == -1)
+ errno = defaultError;
+ if (Mono_Posix_FromPathconfName (name, &name) == -1)
return -1;
return fpathconf (filedes, name);
}
gint64
return -1;
return fpathconf (filedes, name);
}
gint64
-Mono_Posix_Syscall_pathconf (c
har *path, int name
)
+Mono_Posix_Syscall_pathconf (c
onst char *path, int name, int defaultError
)
{
{
- if (Mono_Posix_FromPathConf (name, &name) == -1)
+ errno = defaultError;
+ if (Mono_Posix_FromPathconfName (name, &name) == -1)
return -1;
return pathconf (path, name);
}
gint64
return -1;
return pathconf (path, name);
}
gint64
-Mono_Posix_Syscall_sysconf (int name)
+Mono_Posix_Syscall_sysconf (int name
, int defaultError
)
{
{
- if (Mono_Posix_FromSysConf (name, &name) == -1)
+ errno = defaultError;
+ if (Mono_Posix_FromSysconfName (name, &name) == -1)
return -1;
return sysconf (name);
}
return -1;
return sysconf (name);
}
-gint64
+mph_size_t
Mono_Posix_Syscall_confstr (int name, char *buf, mph_size_t len)
{
mph_return_if_size_t_overflow (len);
Mono_Posix_Syscall_confstr (int name, char *buf, mph_size_t len)
{
mph_return_if_size_t_overflow (len);
- if (Mono_Posix_FromConf
Str
(name, &name) == -1)
+ if (Mono_Posix_FromConf
strName
(name, &name) == -1)
return -1;
return confstr (name, buf, (size_t) len);
}
return -1;
return confstr (name, buf, (size_t) len);
}
@@
-223,19
+222,42
@@
gint32
Mono_Posix_Syscall_lockf (int fd, int cmd, mph_off_t len)
{
mph_return_if_off_t_overflow (len);
Mono_Posix_Syscall_lockf (int fd, int cmd, mph_off_t len)
{
mph_return_if_off_t_overflow (len);
- if (Mono_Posix_FromLock
Flags
(cmd, &cmd) == -1)
+ if (Mono_Posix_FromLock
fCommand
(cmd, &cmd) == -1)
return -1;
return lockf (fd, cmd, (off_t) len);
}
return -1;
return lockf (fd, cmd, (off_t) len);
}
-void
+int
Mono_Posix_Syscall_swab (void *from, void *to, mph_ssize_t n)
{
if (mph_have_long_overflow (n))
Mono_Posix_Syscall_swab (void *from, void *to, mph_ssize_t n)
{
if (mph_have_long_overflow (n))
- return;
+ return
-1
;
swab (from, to, (ssize_t) n);
swab (from, to, (ssize_t) n);
+ return 0;
}
}
+int
+Mono_Posix_Syscall_setusershell (void)
+{
+ setusershell ();
+ return 0;
+}
+
+int
+Mono_Posix_Syscall_endusershell (void)
+{
+ endusershell ();
+ return 0;
+}
+
+int
+Mono_Posix_Syscall_sync (void)
+{
+ sync ();
+ return 0;
+}
+
+
G_END_DECLS
/*
G_END_DECLS
/*