[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30033 - msh/src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30033 - msh/src |
Date: |
Wed, 9 Oct 2013 11:08:03 +0200 |
Author: harsha
Date: 2013-10-09 11:08:03 +0200 (Wed, 09 Oct 2013)
New Revision: 30033
Modified:
msh/src/test_pty.c
Log:
- remove dead code; add debug output
Modified: msh/src/test_pty.c
===================================================================
--- msh/src/test_pty.c 2013-10-09 08:57:48 UTC (rev 30032)
+++ msh/src/test_pty.c 2013-10-09 09:08:03 UTC (rev 30033)
@@ -336,7 +336,8 @@
const char *fn;
int master;
int ret;
-
+
+ LOG_DEBUG ("Creating PTY\n");
master = posix_openpt (O_RDWR);
if (-1 == master)
{
@@ -640,102 +641,3 @@
GNUNET_free ((void *) argv);
return ret;
}
-
-#if 0
- const char *ptysname;
- int cnt;
- int ptym;
- int ptys;
- int fret;
-
- chld_argv = GNUNET_malloc (sizeof (char *) * argc);
- for (cnt = 0; cnt < (argc - 1); cnt++)
- {
- chld_argv[cnt] = GNUNET_strdup (argv[cnt + 1]);
- }
- GNUNET_log_setup ("test-pty", "DEBUG", NULL);
- if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
- GNUNET_NO, GNUNET_NO)))
- {
- GNUNET_break (0);
- return 1;
- }
- ptym = posix_openpt (O_RDWR);
- if (-1 == ptym)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "posix_openpt");
- return 1;
- }
- if (-1 == grantpt (ptym))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "grantpt");
- return 1;
- }
- if (-1 == unlockpt (ptym))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "unlockpt");
- return 1;
- }
- if (NULL == (ptysname = ptsname (ptym)))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "ptsname");
- return 1;
- }
- LOG_DEBUG ("Slave PTY: %s\n", ptysname);
- shc_chld =
- GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
- fret = fork();
- if (-1 == fret)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "fork");
- return 1;
- }
- if (0 == fret)
- {
- struct termios settings;
- pid_t mypid;
-
- mypid = getpid ();
- ptys = open (ptysname, O_RDWR);
- if (-1 == ptys)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "open");
- return 1;
- }
- tcgetattr (ptys, &settings);
- cfmakeraw (&settings);
- settings.c_lflag &= ~(ECHO);
- settings.c_lflag |= (ICANON | ISIG);
- tcsetattr (ptys, TCSANOW, &settings);
- close (ptym);
- close (0);
- close (1);
- //close (2);
- if ( (-1 == dup (ptys)) ||
- (-1 == dup (ptys)) ) // || (-1 == dup (ptys)) )
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "dup");
- return 1;
- }
- close (ptys);
- if (-1 == setsid ())
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsid");
- return 1;
- }
- LOG_DEBUG ("Execing %s\n", chld_argv[0]);
- if (-1 == execvp (chld_argv[0], chld_argv))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "execvp");
- return 1;
- }
- }
- close (ptys);
- chld_io = GNUNET_DISK_get_handle_from_int_fd (ptym);
- our_in = GNUNET_DISK_get_handle_from_int_fd (0);
- GNUNET_SCHEDULER_run (&run, NULL);
- (void) wait (NULL);
- GNUNET_DISK_file_close (chld_io);
- return 0;
-
-#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30033 - msh/src,
gnunet <=