xemacs-beta: src/process.c comparison

comparison src/process.c @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3

author	cvs
date	Mon, 13 Aug 2007 10:04:58 +0200
parents	e45d5e7c476e
children	d44af0c54775

comparison

equal deleted inserted replaced

-:f427b8ec4379
+:41ff10fd062f
 *forkin = sv[0];
 #endif /* not SKTPAIR */
 return 0;
 }
-#ifndef VMS /* VMS version of this function is in vmsproc.c.  */
 static Bufbyte
 get_eof_char (struct Lisp_Process *p)
 {
 /* Figure out the eof character for the outfd of the given process.
 close_descriptor_pair (inchannel, outchannel);
 errno = temp;
 report_file_error ("Opening pty or pipe", Qnil);
 }
 }
-#endif /* not VMS */
 /* This function is the unwind_protect form for Fstart_process_internal.  If
 PROC doesn't have its pid set, then we know someone has signalled
 an error and the process wasn't started successfully, so we should
 remove it from the process list.  */
 /* !!#### This function has not been Mule-ized */
 Lisp_Object buffer, name, program, proc, current_dir;
 Lisp_Object tem;
 int speccount = specpdl_depth ();
 struct gcpro gcpro1, gcpro2, gcpro3;
-#ifdef VMS
-char *new_argv;
-int len;
-#else
 char **new_argv;
-#endif
 int i;
 name = args[0];
 buffer = args[1];
 program = args[2];
 if (NILP (Ffile_accessible_directory_p (current_dir)))
 report_file_error ("Setting current directory",
 		       list1 (current_buffer->directory));
 #endif /* 0 */
-#ifdef VMS
-/* Make a one member argv with all args concatenated
-together separated by a blank.  */
-len = XSTRING_LENGTH (program) + 2;
-for (i = 3; i < nargs; i++)
-{
-tem = args[i];
-CHECK_STRING (tem);
-len += XSTRING_LENGTH (tem) + 1;	/* count the blank */
-}
-new_argv = (char *) alloca (len);
-strcpy (new_argv, XSTRING_DATA (program));
-for (i = 3; i < nargs; i++)
-{
-tem = args[i];
-CHECK_STRING (tem);
-strcat (new_argv, " ");
-strcat (new_argv, XSTRING_DATA (tem));
-}
-/* Need to add code here to check for program existence on VMS */
-#else /* not VMS */
 /* If program file name is not absolute, search our path for it */
 if (!IS_DIRECTORY_SEP (XSTRING_BYTE (program, 0))
 && !(XSTRING_LENGTH (program) > 1
 	   && IS_DEVICE_SEP (XSTRING_BYTE (program, 1))))
 {
 tem = args[i];
 CHECK_STRING (tem);
 new_argv[i - 2] = (char *) XSTRING_DATA (tem);
 }
 new_argv[i - 2] = 0;
-#endif /* not VMS */
 proc = make_process_internal (name);
 XPROCESS (proc)->buffer = buffer;
 XPROCESS (proc)->command = Flist (nargs - 2,
 Charcount
 read_process_output (Lisp_Object proc)
 {
 /* This function can GC */
 Bytecount nbytes, nchars;
-#ifdef VMS
-char *chars;
-#else
 Bufbyte chars[1024];
-#endif
 Lisp_Object outstream;
 struct Lisp_Process *p = XPROCESS (proc);
 /* If there is a lot of output from the subprocess, the loop in
 execute_internal_event() might call read_process_output() more
 restore_match_data ();
 CHECK_INT (filter_result);
 return XINT (filter_result);
 }
-#ifdef VMS
-VMS_PROC_STUFF *vs, *get_vms_process_pointer();
-vs = get_vms_process_pointer (XINT (p->pid));
-if (vs)
-{
-if (!vs->iosb[0])
-	return 0;		/* Really weird if it does this */
-if (!(vs->iosb[0] & 1))
-	return -1;		/* I/O error */
-}
-else
-error ("Could not get VMS process pointer");
-chars = vs->inputBuffer;
-nbytes = clean_vms_buffer (chars, vs->iosb[1]);
-if (nbytes <= 0)
-{
-start_vms_process_read (vs); /* Crank up the next read on the process */
-return 1;			/* Nothing worth printing, say we got 1 */
-}
-#else /* not VMS */
 #if 0 /* FSFmacs */
 /* #### equivalent code from FSFmacs.  Would need some porting
 for Windows NT. */
 if (proc_buffered_char[channel] < 0)
 #ifdef WINDOWSNT
 }
 #endif /* FSFmacs */
 nbytes = Lstream_read (XLSTREAM (p->instream), chars, sizeof (chars));
 if (nbytes <= 0) return nbytes;
-#endif /* not VMS */
 nchars = bytecount_to_charcount (chars, nbytes);
 outstream = p->filter;
 if (!NILP (outstream))
 {
 running_asynch_code = 1;
 call2_trapping_errors ("Error in process filter",
 			     outstream, proc, make_string (chars, nbytes));
 running_asynch_code = 0;
 restore_match_data ();
-#ifdef VMS
-start_vms_process_read (vs);
-#endif
 return nchars;
 }
 /* If no filter, write into buffer if it isn't dead.  */
 if (!NILP (p->buffer) && BUFFER_LIVE_P (XBUFFER (p->buffer)))
 					 BUF_ZV (buf));
 BUF_SET_PT (buf, old_point);
 UNGCPRO;
 }
-#ifdef VMS
-start_vms_process_read (vs);
-#endif
 return nchars;
 }
 /* Sending data to subprocess */
 Lisp_Object defeat_volatile_kludge = (Lisp_Object) proc;
 #else
 Lisp_Object defeat_volatile_kludge = proc;
 #endif
-#ifdef VMS
-VMS_PROC_STUFF *vs, *get_vms_process_pointer (int);
-#endif /* VMS */
 GCPRO2 (defeat_volatile_kludge, lstream);
 if (p->outfd < 0)
 signal_simple_error ("Process not open for writing", proc);
-#ifdef VMS
-vs = get_vms_process_pointer (XINT (p->pid));
-if (vs == 0)
-error ("Could not find this process: %x",
-	   XINT (p->pid));
-else if (write_to_vms_process (vs, buf, len))
-;
-#else
 if (nonrelocatable)
 lstream =
 make_fixed_buffer_input_stream (nonrelocatable + start, len);
 else if (GC_BUFFERP (relocatable))
 	      Lstream_flush (XLSTREAM (p->filedesc_stream));
 	      signal (SIGPIPE, old_sigpipe);
 	    }
 	}
 }
-#endif /* !VMS */
 else
 { /* We got here from a longjmp() from the SIGPIPE handler */
 signal (SIGPIPE, old_sigpipe);
 p->status_symbol = Qexit;
 p->exit_code = 256; /* #### SIGPIPE ??? */
 p->core_dumped = 0;
 p->tick++;
 process_tick++;
 deactivate_process (proc);
-#ifdef VMS
-error ("Error writing to process %s; closed it",
-	     XSTRING_DATA (p->name));
-#else
 error ("SIGPIPE raised on process %s; closed it",
 	     XSTRING_DATA (p->name));
-#endif
 }
 old_sigpipe = (SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap);
 Lstream_flush (XLSTREAM (p->outstream));
 signal (SIGPIPE, old_sigpipe);
 UNGCPRO;
 CONST char *
 signal_name (int signum)
 {
 if (signum >= 0 && signum < NSIG)
-#ifndef VMS
 return (CONST char *) sys_siglist[signum];
-#else
-return (CONST char *) sys_errlist[signum];
-#endif
 return (CONST char *) GETTEXT ("unknown signal");
 }
 /* Compute the Lisp form of the process status from
 the numeric status that was returned by `wait'.  */
 if (!nomsg)
 	status_notify ();
 break;
 #endif /* ! defined (SIGCONT) */
 case SIGINT:
-#ifdef VMS
-send_process (proc, Qnil, (Bufbyte *) "\003", 0,
-		    1); /* ^C */
-goto whoosh;
-#endif
 case SIGQUIT:
-#ifdef VMS
-send_process (proc, Qnil, (Bufbyte *) "\031", 0,
-		    1); /* ^Y */
-goto whoosh;
-#endif
 case SIGKILL:
-#ifdef VMS
-sys$forcex (&(XINT (p->pid)), 0, 1);
-whoosh:
-#endif
 flush_pending_output (p->infd);
 break;
 }
 /* If we don't have process groups, send the signal to the immediate
 /* Make sure the process is really alive.  */
 if (! EQ (XPROCESS (proc)->status_symbol, Qrun))
 error ("Process %s not running", XSTRING_DATA (XPROCESS (proc)->name));
-#ifdef VMS
-send_process (proc, Qnil, (Bufbyte *) "\032", 0, 1);   /* ^Z */
-#else
 if (XPROCESS (proc)->pty_flag)
 {
 /* #### get_eof_char simply doesn't return the correct character
 here.  Maybe it is needed to determine the right eof
 character in init_process_fds but here it simply screws
 else
 {
 close (XPROCESS (proc)->outfd);
 XPROCESS (proc)->outfd = open (NULL_DEVICE, O_WRONLY, 0);
 }
-#endif /* !VMS */
 return process;
 }
 /************************************************************************/
 	  /* It's possible that we got as far in the process-creation
 	     process as creating the descriptors but didn't get so
 	     far as selecting the process for input.  In this
 	     case, p->pid is nil: p->pid is set at the same time that
 	     the process is selected for input. */
-#ifdef VMS
-	  {
-	    VMS_PROC_STUFF *get_vms_process_pointer (), *vs;
-	    if (outchannel >= 0)
-	      sys$dassgn (outchannel);
-	    vs = get_vms_process_pointer (XINT (p->pid));
-	    if (vs)
-	      give_back_vms_process_stuff (vs);
-	  }
-#endif /* VMS */
 	  /* Must call this before setting the file descriptors to 0 */
 	  event_stream_unselect_process (p);
 	}
 p->infd  = -1;

Mercurial > hg > xemacs-beta

comparison src/process.c @ 209:41ff10fd062f r20-4b3