* sendcommand.c: fix behavior of SEND_LISTING mode
* sysdep.c: client_gets() fill buffer with "000" terminator when returning -1
+ Revision 572.17 2000/07/17 02:38:08 ajc
+ * Completed serv_vandelay.c (importer/exporter module)
+ * sendcommand.c: fix behavior of SEND_LISTING mode
+ * sysdep.c: client_gets() fill buffer with "000" terminator when returning -1
+
Revision 572.16 2000/07/14 03:06:55 ajc
* Added .ATN (DOWN) and .ATS (SCDN 1) commands to the client
Revision 572.16 2000/07/14 03:06:55 ajc
* Added .ATN (DOWN) and .ATS (SCDN 1) commands to the client
Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
* Initial CVS import
Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
* Initial CVS import
/*
* make sure only one copy of sendcommand runs at a time, using lock files
*/
/*
* make sure only one copy of sendcommand runs at a time, using lock files
*/
-int set_lockfile(void) {
+int set_lockfile(void)
+{
- if ((lfp = fopen(LOCKFILE,"r")) != NULL) {
- fscanf(lfp,"%d",&onppid);
- fclose(lfp);
- if (!kill(onppid, 0) || errno == EPERM) return 1;
- }
-
- lfp=fopen(LOCKFILE,"w");
- fprintf(lfp,"%ld\n",(long)getpid());
- fclose(lfp);
- return(0);
+ if ((lfp = fopen(LOCKFILE, "r")) != NULL) {
+ fscanf(lfp, "%d", &onppid);
+ fclose(lfp);
+ if (!kill(onppid, 0) || errno == EPERM)
+ return 1;
+ lfp = fopen(LOCKFILE, "w");
+ fprintf(lfp, "%ld\n", (long) getpid());
+ fclose(lfp);
+ return (0);
+}
-void remove_lockfile(void) {
+void remove_lockfile(void)
+{
/*
* Why both cleanup() and nq_cleanup() ? Notice the alarm() call in
/*
* Why both cleanup() and nq_cleanup() ? Notice the alarm() call in
{
remove_lockfile();
exit(e);
{
remove_lockfile();
exit(e);
void cleanup(int e)
{
static int nested = 0;
alarm(30);
void cleanup(int e)
{
static int nested = 0;
alarm(30);
- signal(SIGALRM,nq_cleanup);
- if (nested++ < 1) serv_puts("QUIT");
+ signal(SIGALRM, nq_cleanup);
+ if (nested++ < 1)
+ serv_puts("QUIT");
/*
* This is implemented as a function rather than as a macro because the
/*
* This is implemented as a function rather than as a macro because the
void logoff(int e)
{
cleanup(e);
void logoff(int e)
{
cleanup(e);
/*
* Connect sendcommand to the Citadel server running on this computer.
*/
/*
* Connect sendcommand to the Citadel server running on this computer.
*/
-void np_attach_to_server(void) {
+void np_attach_to_server(void)
+{
char hostbuf[256], portbuf[256];
char buf[256];
char hostbuf[256], portbuf[256];
char buf[256];
- char *args[] = { "sendcommand", NULL } ;
+ char *args[] =
+ {"sendcommand", NULL};
fprintf(stderr, "Attaching to server...\n");
attach_to_server(1, args, hostbuf, portbuf);
serv_gets(buf);
fprintf(stderr, "Attaching to server...\n");
attach_to_server(1, args, hostbuf, portbuf);
serv_gets(buf);
- fprintf(stderr, "%s\n",&buf[4]);
- sprintf(buf,"IPGM %d", config.c_ipgm_secret);
+ fprintf(stderr, "%s\n", &buf[4]);
+ sprintf(buf, "IPGM %d", config.c_ipgm_secret);
serv_puts(buf);
serv_gets(buf);
serv_puts(buf);
serv_gets(buf);
- fprintf(stderr, "%s\n",&buf[4]);
- if (buf[0]!='2') {
+ fprintf(stderr, "%s\n", &buf[4]);
+ if (buf[0] != '2') {
/*
* Change directories if specified
*/
/*
* Change directories if specified
*/
- for (a=1; a<argc; ++a) {
+ for (a = 1; a < argc; ++a) {
if (!strncmp(argv[a], "-h", 2)) {
strcpy(bbs_home_directory, argv[a]);
strcpy(bbs_home_directory, &bbs_home_directory[2]);
home_specified = 1;
if (!strncmp(argv[a], "-h", 2)) {
strcpy(bbs_home_directory, argv[a]);
strcpy(bbs_home_directory, &bbs_home_directory[2]);
home_specified = 1;
- }
- else {
- if (strlen(cmd)>0) strcat(cmd, " ");
+ } else {
+ if (strlen(cmd) > 0)
+ strcat(cmd, " ");
- signal(SIGINT,cleanup);
- signal(SIGQUIT,cleanup);
- signal(SIGHUP,cleanup);
- signal(SIGTERM,cleanup);
+ signal(SIGINT, cleanup);
+ signal(SIGQUIT, cleanup);
+ signal(SIGHUP, cleanup);
+ signal(SIGTERM, cleanup);
- fprintf(stderr, "sendcommand: started. pid=%ld\n",(long)getpid());
+ fprintf(stderr, "sendcommand: started. pid=%ld\n", (long) getpid());
fflush(stderr);
np_attach_to_server();
fflush(stderr);
fflush(stderr);
np_attach_to_server();
fflush(stderr);
serv_gets(buf);
fprintf(stderr, "%s\n", buf);
serv_gets(buf);
fprintf(stderr, "%s\n", buf);
while (serv_gets(buf), strcmp(buf, "000")) {
printf("%s\n", buf);
while (serv_gets(buf), strcmp(buf, "000")) {
printf("%s\n", buf);
- else if (buf[0]=='4') {
+ } else if (buf[0] == '4') {
- if (fgets(buf, 255, stdin)==NULL) strcpy(buf, "000");
- if (strlen(buf)>0)
- if (buf[strlen(buf)-1]=='\n')
- buf[strlen(buf)-1]=0;
- if (strlen(buf)>0)
- if (buf[strlen(buf)-1]=='\r')
- buf[strlen(buf)-1]=0;
- if (strcmp(buf, "000")) serv_puts(buf);
- } while (strcmp(buf, "000"));
+ if (fgets(buf, 255, stdin) == NULL)
+ strcpy(buf, "000");
+ if (strlen(buf) > 0)
+ if (buf[strlen(buf) - 1] == '\n')
+ buf[strlen(buf) - 1] = 0;
+ if (strlen(buf) > 0)
+ if (buf[strlen(buf) - 1] == '\r')
+ buf[strlen(buf) - 1] = 0;
+ if (strcmp(buf, "000"))
+ serv_puts(buf);
+ } while (strcmp(buf, "000"));
fprintf(stderr, "sendcommand: processing ended.\n");
cleanup(0);
return 0;
fprintf(stderr, "sendcommand: processing ended.\n");
cleanup(0);
return 0;
void artv_do_export(void) {
void artv_do_export(void) {
- cprintf("%d Yikes.\n", LISTING_FOLLOWS);
+ cprintf("%d Exporting all Citadel databases.\n", LISTING_FOLLOWS);
+
+ cprintf("version\n%d\n", REV_LEVEL);
/* export the config file */
cprintf("config\n");
/* export the config file */
cprintf("config\n");
client_gets(buf); config.c_maxsessions = atoi(buf);
client_gets(config.c_net_password);
client_gets(buf); config.c_port_number = atoi(buf);
client_gets(buf); config.c_maxsessions = atoi(buf);
client_gets(config.c_net_password);
client_gets(buf); config.c_port_number = atoi(buf);
+ client_gets(buf); config.c_ipgm_secret = atoi(buf);
client_gets(buf); config.c_ep.expire_mode = atoi(buf);
client_gets(buf); config.c_ep.expire_value = atoi(buf);
client_gets(buf); config.c_userpurge = atoi(buf);
client_gets(buf); config.c_ep.expire_mode = atoi(buf);
client_gets(buf); config.c_ep.expire_value = atoi(buf);
client_gets(buf); config.c_userpurge = atoi(buf);
client_gets(smi.smi_content_type);
client_gets(buf); smi.smi_mod = atoi(buf);
client_gets(smi.smi_content_type);
client_gets(buf); smi.smi_mod = atoi(buf);
+ lprintf(7, "message #%ld\n", msgnum);
/* decode base64 message text */
strcpy(tempfile, tmpnam(NULL));
/* decode base64 message text */
strcpy(tempfile, tmpnam(NULL));
while (client_gets(buf), strcasecmp(buf, END_OF_MESSAGE)) {
fprintf(fp, "%s\n", buf);
}
while (client_gets(buf), strcasecmp(buf, END_OF_MESSAGE)) {
fprintf(fp, "%s\n", buf);
}
+ fclose(fp);
+ fp = fopen(tempfile, "rb");
+ fseek(fp, 0L, SEEK_END);
msglen = ftell(fp);
fclose(fp);
msglen = ftell(fp);
fclose(fp);
+ lprintf(9, "msglen = %ld\n", msglen);
mbuf = mallok(msglen);
fp = fopen(tempfile, "rb");
mbuf = mallok(msglen);
fp = fopen(tempfile, "rb");
void artv_do_import(void) {
char buf[256];
void artv_do_import(void) {
char buf[256];
+ char s_version[256];
+ int version;
cprintf("%d sock it to me\n", SEND_LISTING);
while (client_gets(buf), strcmp(buf, "000")) {
lprintf(9, "import keyword: <%s>\n", buf);
cprintf("%d sock it to me\n", SEND_LISTING);
while (client_gets(buf), strcmp(buf, "000")) {
lprintf(9, "import keyword: <%s>\n", buf);
- if (!strcasecmp(buf, "config")) artv_import_config();
+ if (!strcasecmp(buf, "version")) {
+ client_gets(s_version);
+ version = atoi(s_version);
+ if ((version < REV_MIN) || (version > REV_LEVEL)) {
+ lprintf(7, "Version mismatch - aborting\n");
+ goto artv_flush_import;
+ }
+ }
+ else if (!strcasecmp(buf, "config")) artv_import_config();
else if (!strcasecmp(buf, "control")) artv_import_control();
else if (!strcasecmp(buf, "user")) artv_import_user();
else if (!strcasecmp(buf, "room")) artv_import_room();
else if (!strcasecmp(buf, "control")) artv_import_control();
else if (!strcasecmp(buf, "user")) artv_import_user();
else if (!strcasecmp(buf, "room")) artv_import_room();
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
lprintf(1, "citserver: Can't bind: %s\n",
strerror(errno));
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
lprintf(1, "citserver: Can't bind: %s\n",
strerror(errno));
return(-1);
}
if (listen(s, queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
return(-1);
}
if (listen(s, queue_len) < 0) {
lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
buf[i] = 0;
while ((strlen(buf)>0)&&(!isprint(buf[strlen(buf)-1])))
buf[strlen(buf)-1] = 0;
buf[i] = 0;
while ((strlen(buf)>0)&&(!isprint(buf[strlen(buf)-1])))
buf[strlen(buf)-1] = 0;
- lprintf(9, "client_gets(%s)\n", buf);
+ if (retval < 0) strcpy(buf, "000");