Changeset 1065 for TI05-delivery/trunk
- Timestamp:
- 30/05/06 17:22:44 (15 years ago)
- Location:
- TI05-delivery/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/trunk/src/Makefile
r1064 r1065 26 26 make -C $(BBFTPD) install 27 27 28 clean: 28 clean: clean_server clean_client 29 30 clean_server: 29 31 -rm $(BBFTPD)/*.o $(BBFTPD)/bbftpd 32 33 clean_client: 30 34 -rm $(BBFTPC)/*.o $(BBFTPC)/bbftp -
TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd.c
r1064 r1065 805 805 ** Run as a daemon 806 806 */ 807 #ifdef NDG_PYTHON_EMBED 808 if ((fatherpid = do_daemon(argc, argv, envp)) > 0) return fatherpid; 809 #else 807 810 do_daemon(argc, argv, envp); 811 #endif 808 812 /* 809 813 ** Check for debug … … 1413 1417 int argc, i; 1414 1418 char **argv, **arg_p; 1419 int pid; 1415 1420 1416 1421 /* … … 1432 1437 } 1433 1438 1434 bbftpd_main(argc, argv, environ); 1435 1436 // I'm not sure we ever get here. 1439 pid = bbftpd_main(argc, argv, environ); 1440 1437 1441 free(argv); 1438 Py_RETURN_NONE;1442 return Py_BuildValue("i", pid); 1439 1443 } 1440 1444 1441 1445 static PyMethodDef BbftpdMethods[] = { 1442 {"run", bbftpd_run, METH_VARARGS, "Execute the bbftpd server "},1446 {"run", bbftpd_run, METH_VARARGS, "Execute the bbftpd server. Returns the PID of the server process"}, 1443 1447 {NULL, NULL, 0, NULL} 1444 1448 }; -
TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd_daemon.c
r773 r1065 87 87 extern int outcontrolsock ; 88 88 89 #ifdef NDG_PYTHON_EMBED 90 int do_daemon(int argc, char **argv, char **envp) 91 #else 89 92 void do_daemon(int argc,char **argv,char **envp) 93 #endif 90 94 { 91 95 … … 133 137 exit(1); 134 138 } 139 #ifdef NDG_PYTHON_EMBED 140 /* Return the daemon's PID */ 141 if (retcode > 0) return retcode; 142 #else 135 143 /* No need for the parent any more */ 136 144 if (retcode > 0) _exit(0); 137 145 #endif 138 146 prpg = 0 ; 139 147 prpg = setsid () ; /* disassoiciate from control terminal */ … … 214 222 incontrolsock = msgsock ; 215 223 outcontrolsock = msgsock ; 216 return; 224 #ifdef NDG_PYTHON_EMBED 225 return 0; 226 #else 227 return; 228 #endif 229 217 230 } 218 231
Note: See TracChangeset
for help on using the changeset viewer.