1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
--- src/common/gst-auth.c.orig Mon Aug 8 15:00:01 2005
+++ src/common/gst-auth.c Sat Sep 10 01:47:35 2005
@@ -55,6 +55,82 @@
static int root; /* if we are root, no password is
required */
+#ifdef __FreeBSD__
+static int
+_forkpty (int *amaster, char *name,
+ struct termios *termp, struct winsize *winp)
+{
+ int master, slave;
+ char *line;
+ pid_t pid;
+
+ master = posix_openpt (O_RDWR);
+ if (master == -1)
+ return (-1);
+
+ if (grantpt (master) == -1)
+ {
+ (void) close (master);
+ return (-1);
+ }
+
+ if (unlockpt (master) == -1)
+ {
+ (void) close (master);
+ return (-1);
+ }
+
+ line = ptsname (master);
+ if (line == NULL)
+ {
+ (void) close (master);
+ return (-1);
+ }
+
+ slave = open (line, O_RDWR);
+ if (slave < 0)
+ {
+ (void) close (master);
+ return (-1);
+ }
+
+ if (amaster)
+ *amaster = master;
+
+ if (name)
+ strcpy (name, line);
+
+ if (termp)
+ (void) tcsetattr(slave, TCSAFLUSH, termp);
+
+ if (winp)
+ (void) ioctl(slave, TIOCSWINSZ, (char *) winp);
+
+ pid = fork ();
+ switch (pid)
+ {
+ case -1:
+ (void) close (slave);
+ (void) close (master);
+ return (-1);
+ case 0:
+ (void) close (master);
+ dup2 (slave, STDIN_FILENO);
+ dup2 (slave, STDOUT_FILENO);
+ dup2 (slave, STDERR_FILENO);
+ return (0);
+ default:
+ (void) close (slave);
+ return (pid);
+ }
+
+ (void) close (master);
+ return (-1);
+}
+#else
+#define _forkpty forkpty
+#endif
+
static void
gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text)
{
@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar
int p[2];
pipe (p);
- tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL);
+ tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL);
if (tool->backend_pid < 0) {
gst_auth_display_error_message (tool,
@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar
unsetenv("LANG");
unsetenv("LANGUAGE");
- dup2 (p[1], 1);
- dup2 (p[1], 2);
+ dup2 (p[1], STDOUT_FILENO);
+ dup2 (p[1], STDERR_FILENO);
close (p[0]);
execv (args[0], args);
- exit (255);
+ _exit (255);
} else {
#ifndef __FreeBSD__
/* Linux's su works ok with echo disabling */
|
