Ignore:
Timestamp:
12/06/06 17:03:47 (13 years ago)
Author:
spascoe
Message:

Client-side python embedding is being implemented but doesn't pass the
test cases yet.

I've uncovered a bug (see #343) which needs fixing before the embedded client
can be fully debugged.

Location:
TI05-delivery/trunk/src
Files:
1 added
2 edited

Legend:

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

    r773 r1157  
    368368} 
    369369 
     370 
     371#ifdef NDG_PYTHON_EMBED 
     372bbftpc_main(int argc, char **argv, char **envp) { 
     373#else 
    370374main(argc, argv, envp) 
    371375    int argc; 
     
    373377    char **envp; 
    374378{ 
     379#endif 
    375380    extern char *optarg; 
    376381    extern int optind, opterr, optopt; 
     
    485490# endif 
    486491#endif 
     492#ifdef NDG_PYTHON_EMBED 
     493                printmessage(stdout,CASE_NORMAL,0,timestamp,"                   Embedded in Python interpreter\n") ; 
     494#endif // NDG_PYTHON_EMBED 
     495 
    487496                printmessage(stdout,CASE_NORMAL,0,timestamp,"                   default number of tries = %d  \n",NBTRYMAX) ; 
    488497                printmessage(stdout,CASE_NORMAL,0,timestamp,"                   default sendwinsize = %d Kbytes\n",sendwinsize) ; 
     
    494503    } 
    495504 
     505#ifndef NDG_PYTHON_EMBED 
    496506/* 
    497507** Check for stderr replacement 
     
    551561*/ 
    552562    blockallsignals() ; 
     563 
     564#endif // NDG_PYTHON_EMBED 
    553565 
    554566/* 
     
    787799        } 
    788800    } 
     801 
     802#ifndef NDG_PYTHON_EMBED 
    789803/* 
    790804** Check for the local user in order to find the .bbftprc file 
     
    10311045        } 
    10321046    } 
     1047#endif // NDG_PYTHON_EMBED 
     1048 
    10331049/* 
    10341050** Check for input file or command line 
     
    14201436    sleep(1) ; 
    14211437    bbftp_close_control() ; 
     1438#ifndef NDG_PYTHON_EMBED 
    14221439    exit(myexitcode) ; 
     1440#endif 
    14231441} 
  • TI05-delivery/trunk/src/python_ext/bbftpd.c

    r1144 r1157  
    314314  for (i=0; i<argc; i++) { 
    315315    if ((item = PySequence_GetItem(daemon_args, i)) == NULL) { 
     316      free(argv); 
    316317      Py_DECREF(authHandler); 
    317318      Py_DECREF(daemon_args); 
Note: See TracChangeset for help on using the changeset viewer.