UML - Move remaining useful contents of user_util.h
PATCH 5/7 UML - Move remaining useful contents of user_util.h
Rescue the useful contents of the soon-to-be-gone user-util.h.
pty.c now gets ptsname from stdlib.h like it should have always done.
CATCH_EINTR is now in os.h, although perhaps all usage should be under os-Linux at some point.
get_pty is also in os.h.
This patch restores the old definition of ARRAY_SIZE in user.h. This file is included only in userspace files, so there will be no conflict with the kernel's new ARRAY_SIZE. The copy of the kernel's ARRAY_SIZE and associated infrastructure is now gone.
--
arch/um/drivers/pty.c | 1 + arch/um/include/os.h | 6 ++++++ arch/um/include/user.h | 19 ++++++++----------- arch/um/include/user_util.h | 18 ------------------ arch/um/os-Linux/sys-i386/tls.c | 1 + 5 files changed, 16 insertions(+), 29 deletions(-)
arch/um/drivers/pty.c +1 -0
@@ -4,6 +4,7 @@*/ #include <stdio.h> +#include <stdlib.h> #include <unistd.h> #include <string.h> #include <errno.h>
arch/um/include/os.h +6 -0
@@ -16,6 +16,8 @@#include "sysdep/tls.h" #include "sysdep/archsetjmp.h" +#define CATCH_EINTR (expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) +#define OS_TYPE_FILE 1#define OS_TYPE_DIR 2#define OS_TYPE_SYMLINK 3
@@ -341,6 +343,10 @@ extern void maybe_sigio_broken(int fd, iextern void sig_handler_common_skas (int sig,void *sc_ptr);extern void user_signal (int sig,union uml_pt_regs *regs,int pid); +/* sys-x86_64/prctl.c */ extern int os_arch_prctl (int pid,int code,unsigned long *addr); +/* tty.c */ +int get_pty (void ); +#endif
arch/um/include/user.h +8 -11
@@ -6,6 +6,14 @@#ifndef __USER_H__#define __USER_H__ +/* +* The usual definition - copied here because the kernel provides its own, +* fancier, type-safe, definition. Using that one would require +* copying too much infrastructure for my taste, so userspace files +* get less checking than kernel files. +*/ +#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0])) +/* Both on kernelspace and userspace this will provide the size_t definition. It should, at * least. But on userspace it won't hurt surely. */ #include <linux/types.h>
@@ -21,14 +29,3 @@ extern size_t strlcpy(char *, const charextern size_t strlcat (char *,const char *,size_t );#endif - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-file-style: "linux" -* End: -*/
arch/um/include/user_util.h +0 -18
@@ -8,31 +8,13 @@#include "sysdep/ptrace.h" -/* Copied from kernel.h and compiler-gcc.h */ - -/* Force a compilation error if condition is true, but also produce a -result (of value 0 and type size_t), so the expression can be used -e.g. in a structure initializer (or where-ever else comma expressions -aren't permitted). */ -#define BUILD_BUG_ON_ZERO (e) (sizeof(char[1 - 2 * !!(e)]) - 1) - -/* &a[0] degrades to a pointer: a different type from an array */ -#define __must_be_array (a) \ - BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(typeof(a), typeof(&a[0]))) - -#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) - -#define CATCH_EINTR (expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) -extern int mode_tt;extern int grantpt (int __fd);extern int unlockpt (int __fd); -extern char *ptsname (int __fd);extern void *add_signal_handler (int sig,void (*handler)(int ));extern void input_cb (void (*proc)(void *),void *arg,int arg_len); -extern int get_pty (void );extern int switcheroo (int fd,int prot,void *from,void *to,int size);extern void do_exec (int old_pid,int new_pid);extern void tracer_panic (char *msg, ...)
arch/um/os-Linux/sys-i386/tls.c +1 -0
@@ -5,6 +5,7 @@#include <unistd.h> #include "sysdep/tls.h" +#include "user.h" #include "user_util.h" /* Checks whether host supports TLS, and sets *tls_min according to the value
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel