mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

Cosmetic only changes: add #ifdef __FreeBSD__ in appropriate places.

Browse Source
This commit is contained in:
Max Khon 2004-02-11 06:39:16 +00:00
parent 90e5926134
commit d2f02ab4a4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=100630
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sysutils/open/files/patch-open.c
View File

@ -1,14 +1,14 @@
--- open.c.orig Fri Jul 19 22:49:03 1996
+++ open.c Wed Feb 11 05:02:34 2004
+++ open.c Wed Feb 11 12:30:24 2004
@@ -24,7 +24,12 @@
int fd = 0;
int opt, pid;
+#if !defined(__FreeBSD__)
+#if defined(__FreeBSD__)
+ int vt_active;
+#else
struct vt_stat vt;
+#define vt_active vt.v_active
+#else
+ int vt_active;
+#endif
struct passwd *pwnam=NULL;
int vtno = -1;
@ -22,37 +22,43 @@
/*
* I don't like using getopt for this, but otherwise this gets messy.
@@ -44,7 +49,7 @@
@@ -44,7 +49,11 @@
switch (opt) {
case 'c':
vtno = (int) atol(optarg);
- if (vtno < 0 || vtno > 99) {
+#if defined(__FreeBSD__)
+ if (vtno <= 0 || vtno > 99) {
+#else
if (vtno < 0 || vtno > 99) {
+#endif
fprintf(stderr, "open: %s illegal vt number\n", optarg);
return 5;
}
@@ -92,14 +97,19 @@
@@ -92,14 +101,23 @@
return(3);
}
+#if !defined(__FreeBSD__)
if (ioctl(fd, VT_GETSTATE, &vt) < 0) {
perror("open: can't get VTstate\n");
+#else
+#if defined(__FreeBSD__)
+ if (ioctl(fd, VT_GETACTIVE, &vt_active) < 0) {
+ perror("open: can't get active VT\n");
+#else
if (ioctl(fd, VT_GETSTATE, &vt) < 0) {
perror("open: can't get VTstate\n");
+#endif
close(fd);
return(4);
}
}
- sprintf(vtname, VTNAME, vtno);
+#if defined(__FreeBSD__)
+ sprintf(vtname, VTNAME, vtno - 1);
+#else
sprintf(vtname, VTNAME, vtno);
+#endif
/* support for Spawn_Console; running from init
added by Joshua Spoerri, Thu Jul 18 21:13:16 EDT 1996 */
@@ -110,7 +120,7 @@
@@ -110,7 +128,7 @@
dev_t console_dev;
ino_t console_ino;
uid_t console_uid;
@ -61,16 +67,20 @@
if (!(dp=opendir("/proc"))) {
perror("/proc");
@@ -118,7 +128,7 @@
@@ -118,7 +136,11 @@
}
/* get the current tty */
- sprintf(filename,"/dev/tty%d",vt.v_active);
+#if defined(__FreeBSD__)
+ sprintf(filename,VTNAME,vt_active - 1);
+#else
+ sprintf(filename,VTNAME,vt_active);
+#endif
if (stat(filename,&buf)) {
perror(filename);
exit(1);
@@ -204,15 +214,18 @@
@@ -204,15 +226,18 @@
_exit (4); /* silently die */
}
dup(fd); dup(fd);
@ -92,7 +102,7 @@
}
if(as_user)
execlp("login","login","-f",pwnam->pw_name,NULL);
@@ -230,9 +243,11 @@
@@ -230,9 +255,11 @@
if ( do_wait ) {
wait(NULL);
if (show) { /* Switch back... */