scummvm random work

[patches.git] / busybox-xioctl.patch

Index: console-tools/deallocvt.c
===================================================================
--- console-tools/deallocvt.c	(revision 18902)
+++ console-tools/deallocvt.c	(working copy)
@@ -31,8 +31,7 @@ int deallocvt_main(int argc, char **argv
 		bb_show_usage();
 	}
 
-	if (-1 == ioctl(get_console_fd(), VT_DISALLOCATE, num)) {
-		bb_perror_msg_and_die("VT_DISALLOCATE");
-	}
+	xioctl(get_console_fd(), VT_DISALLOCATE, num);
+
 	return EXIT_SUCCESS;
 }
Index: libbb/xfuncs.c
===================================================================
--- libbb/xfuncs.c	(revision 18902)
+++ libbb/xfuncs.c	(working copy)
@@ -639,3 +639,13 @@ int get_terminal_width_height(const int 
 
 	return ret;
 }
+
+/* Die if the ioctl() call failed.  Only support the 3 arg form. */
+#undef xioctl
+int xioctl(int fd, int request, unsigned long arg)
+{
+	int ret = ioctl(fd, request, arg);
+	if (ret != 0)
+		bb_perror_msg_and_die("ioctl");
+	return ret;
+}
Index: miscutils/raidautorun.c
===================================================================
--- miscutils/raidautorun.c	(revision 18902)
+++ miscutils/raidautorun.c	(working copy)
@@ -19,9 +19,7 @@ int raidautorun_main(int argc, char **ar
 	if (argc != 2)
 		bb_show_usage();
 
-	if (ioctl(xopen(argv[1], O_RDONLY), RAID_AUTORUN, NULL) != 0) {
-		bb_perror_msg_and_die("ioctl");
-	}
+	xioctl(xopen(argv[1], O_RDONLY), RAID_AUTORUN, NULL);
 
 	return EXIT_SUCCESS;
 }
Index: include/libbb.h
===================================================================
--- include/libbb.h	(revision 18902)
+++ include/libbb.h	(working copy)
@@ -249,7 +249,8 @@ DIR *warn_opendir(const char *path);
 char *xrealloc_getcwd_or_warn(char *cwd);
 char *xmalloc_readlink_or_warn(const char *path);
 char *xmalloc_realpath(const char *path);
-
+int xioctl(int fd, int request, unsigned long arg);
+#define xioctl(fd,request,arg) xioctl(fd,request,(unsigned long)arg)
 
 //TODO: signal(sid, f) is the same? then why?
 extern void sig_catch(int,void (*)(int));