[BACK]Return to ox_pathfinder.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / util

Diff for /OpenXM/src/util/ox_pathfinder.c between version 1.20 and 1.27

version 1.20, 2004/03/02 06:23:34 version 1.27, 2004/08/12 12:11:41
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.19 2004/02/28 13:39:42 takayama Exp $ */  /* $OpenXM: OpenXM/src/util/ox_pathfinder.c,v 1.26 2004/03/05 06:26:52 takayama Exp $ */
 /* Moved from misc-2003/07/cygwin/test.c */  /* Moved from misc-2003/07/cygwin/test.c */
   
 #include <stdio.h>  #include <stdio.h>
Line 635  char **getServerEnv(char *oxServer) {
Line 635  char **getServerEnv(char *oxServer) {
     argv[i] = oxlog; i++; argv[i] = NULL;      argv[i] = oxlog; i++; argv[i] = NULL;
     if (!NoX) {      if (!NoX) {
       argv[i] = oxterm ; i++; argv[i] = NULL;        argv[i] = oxterm ; i++; argv[i] = NULL;
       argv[i] = oxtermOpt; i++; argv[i] = NULL;        if (((char *)getenv("OX_XTERM_GEOMETRY")) != NULL) {
           /* ex. OX_XTERM_GEOMETRY=80x20+0+0 */
           argv[i] = "-geometry"; i++; argv[i] = NULL;
                   argv[i] = (char *) getenv("OX_XTERM_GEOMETRY"); i++; argv[i] = NULL;
         }else{
           argv[i] = oxtermOpt; i++; argv[i] = NULL;
         }
             /* dirty hack for buggy international xterm cf. OpenXM FAQ */
         argv[i] = "-xrm"; i++; argv[i] = NULL;
         argv[i] = "XTerm*locale:false"; i++; argv[i] = NULL;
   
             if (((char *)getenv("OX_XTERM_SCROLL")) != NULL) {
                   argv[i] = "-sb"; i++; argv[i] = NULL;
                   argv[i] = "-sl"; i++; argv[i] = NULL;
                   argv[i] = (char *) getenv("OX_XTERM_SCROLL"); i++; argv[i] = NULL;
             }
       argv[i] = "-e"; i++; argv[i] = NULL;        argv[i] = "-e"; i++; argv[i] = NULL;
     }      }
     argv[i] = get_ox_path(); i++; argv[i] = NULL;      argv[i] = get_ox_path(); i++; argv[i] = NULL;
Line 1135  char *oxTermWhich_unix(int *typep) {
Line 1150  char *oxTermWhich_unix(int *typep) {
   s = oxWhich("oxterm",p); *typep = T_OXTERM;    s = oxWhich("oxterm",p); *typep = T_OXTERM;
   if (s != NULL) return s;    if (s != NULL) return s;
   
   /*  skip the search of rxvt  (temporary)
   s = oxWhich("rxvt",p); *typep = T_RXVT;    s = oxWhich("rxvt",p); *typep = T_RXVT;
   if (s != NULL) return s;    if (s != NULL) return s;
   */
   
   s = oxWhich("xterm",p); *typep = T_XTERM;    s = oxWhich("xterm",p); *typep = T_XTERM;
   if (s != NULL) return s;    if (s != NULL) return s;
   
   return NULL;    return NULL;
   }
   
   int oxpSendStringAsFile(char *user,char *hostname, char *filename, char *str)
   {
     FILE *fp;
     int i;
     char *comm;
     char *argv[10];
     mode_t oumask;
     oumask = umask((mode_t) (64-1));
     /* 077=111 111 */
     fp = fopen(filename,"w");
     umask(oumask);
     if (fp == NULL) {
           return -1;
     }
     for (i=0; i <strlen(str); i++) {
           fputc(str[i],fp);
     }
     fclose(fp);
     if (strcmp(hostname,"localhost") == 0) return 0;
     comm = (char *)malloc(strlen(user)+strlen(hostname)+strlen(filename)*2+1024);
     if (comm == NULL) return -2;
   
     argv[0] = getCommandPath("scp");
     if (argv[0] == NULL) return -3;
     argv[1] = filename;
     comm = (char *)malloc(strlen(user)+strlen(hostname)+strlen(filename)+256);
     sprintf(comm,"%s@%s:%s",user,hostname,filename);
     argv[2] = comm;
     argv[3] = NULL;
     return oxForkExec(argv);
   }
   
   char *oxpReadOneTimePasswordFromFile(char *filename) {
 }  }
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.27
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>