Changeset 1240


Ignore:
Timestamp:
27/06/06 08:41:19 (13 years ago)
Author:
spascoe
Message:

Some modifications to bbftp_ndg.c being commited before I move it
to the src/python_ext directory.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/trunk/src/bbftp-client-3.2.0/bbftpc/bbftp_ndg.c

    r1239 r1240  
    2424 * Since it is largely based on the original bbftp code I have retained the original 
    2525 * copyright.  Most sections from bbftp.c are not relevent when embedding in python 
    26  * and have been removed. 
     26 * and have been removed.  Support for CASTOR and RFIO has been removed. 
    2727 * 
    2828 * @author Stephen Pascoe 
     
    185185** Variable defining the local options : 
    186186**  
    187 ** localcos: 
    188 **      Value of the local class of service (in case of RFIO ability) 
    189 ** 
    190187** localumask: 
    191188**      Local umask taken by the umask command at start and 
     
    197194*/ 
    198195int     localumask ; 
    199 #if defined(WITH_RFIO) || defined(WITH_RFIO64) 
    200 int     localcos  = SETTOZERO ; 
    201 #endif 
    202196 
    203197char *newcmd = NULL; 
     
    279273*/ 
    280274int     nbpidchild ; 
    281 /* 
    282 ** castfd: 
    283 **      CASTOR file descriptor 
    284 */ 
    285 #ifdef CASTOR 
    286 int     castfd = -1 ; 
    287 char    *castfilename = NULL ; 
    288 #endif 
    289275 
    290276/* 
     
    360346  bbftprc = NULL ; 
    361347  //int     localumask ; 
    362 #if defined(WITH_RFIO) || defined(WITH_RFIO64) 
    363   localcos  = SETTOZERO ; 
    364 #endif 
    365348   
    366349  newcmd = NULL; 
     
    387370  mychildren = NULL ; 
    388371  //int     nbpidchild ; 
    389 #ifdef CASTOR 
    390   castfd = -1 ; 
    391   castfilename = NULL ; 
    392 #endif 
    393372  transferoption = TROPT_TMP | TROPT_DIR | TROPT_MODE | TROPT_ACC;  
    394373  filemode ; 
     
    506485                printmessage(stdout,CASE_NORMAL,0,timestamp,"                   encryption with %s \n",SSLeay_version(SSLEAY_VERSION)) ; 
    507486#endif 
    508 #ifdef WITH_RFIO 
    509 # ifdef CASTOR 
    510                 printmessage(stdout,CASE_NORMAL,0,timestamp,"                   CASTOR support (RFIO)\n") ; 
    511 # else 
    512                 printmessage(stdout,CASE_NORMAL,0,timestamp,"                   HPSS support (RFIO)\n") ; 
    513 # endif 
    514 #endif 
    515 #ifdef WITH_RFIO64 
    516 # ifdef CASTOR 
    517                 printmessage(stdout,CASE_NORMAL,0,timestamp,"                   CASTOR support (RFIO64)\n") ; 
    518 # else 
    519                 printmessage(stdout,CASE_NORMAL,0,timestamp,"                   HPSS support (RFIO64)\n") ; 
    520 # endif 
    521 #endif 
    522487#ifdef AFS 
    523488                printmessage(stdout,CASE_NORMAL,0,timestamp,"                   AFS authentication \n") ; 
     
    708673        } 
    709674    } 
    710     /* 
    711     ** Get 5K for castfilename in order to work with CASTOR 
    712     ** software (even if we are not using it) 
    713     */ 
    714 #ifdef CASTOR 
    715     if ( (castfilename = (char *) malloc (5000)) == NULL ) { 
    716         /* 
    717         ** Starting badly if we are unable to malloc 5K 
    718         */ 
    719         printmessage(stderr,CASE_FATAL_ERROR,10,timestamp,"No memory for CASTOR : %s\n",strerror(errno)) ; 
    720     } 
    721 #endif 
    722675 
    723676    /* 
     
    841794        printmessage(stdout,CASE_NORMAL,0,timestamp,"localumask        = %03o\n",localumask) ; 
    842795        printmessage(stdout,CASE_NORMAL,0,timestamp,"remoteumask       = %03o\n",remoteumask) ; 
    843 #if defined(WITH_RFIO) || defined(WITH_RFIO64) 
    844         printmessage(stdout,CASE_NORMAL,0,timestamp,"localcos          = %d\n",localcos) ; 
    845 #endif 
    846796        printmessage(stdout,CASE_NORMAL,0,timestamp,"remotecos         = %d\n",remotecos) ; 
    847797        printmessage(stdout,CASE_NORMAL,0,timestamp,"buffersize        = %d KB\n",buffersizeperstream) ; 
     
    855805                printmessage(stdout,CASE_NORMAL,0,timestamp,"option %s\n", ((transferoption & TROPT_TMP ) == TROPT_TMP) ? "tmpfile" : "notmpfile") ; 
    856806                printmessage(stdout,CASE_NORMAL,0,timestamp,"option %s\n", ((transferoption & TROPT_RFIO ) == TROPT_RFIO) ? "remoterfio" : "noremoterfio") ; 
    857 #if defined(WITH_RFIO) || defined(WITH_RFIO64) 
    858                 printmessage(stdout,CASE_NORMAL,0,timestamp,"option %s\n", ((transferoption & TROPT_RFIO_O ) == TROPT_RFIO_O) ? "localrfio" : "nolocalrfio") ; 
    859 #endif 
    860807                printmessage(stdout,CASE_NORMAL,0,timestamp,"option %s\n", ((transferoption & TROPT_MODE ) == TROPT_MODE) ? "keepmode" : "nokeepmode") ; 
    861808                printmessage(stdout,CASE_NORMAL,0,timestamp,"option %s\n", ((transferoption & TROPT_ACC ) == TROPT_ACC) ? "keepaccess" : "nokeepaccess") ; 
Note: See TracChangeset for help on using the changeset viewer.