From: Art Cancro <ajc@citadel.org>
Date: Wed, 29 Dec 1999 04:44:00 +0000 (+0000)
Subject: * client_chat.c: display "No message sent" if a send page is aborted.
X-Git-Tag: v7.86~7373
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=e7438f15b56ccb2c1295e9757c4734e37509b906;p=citadel.git

* client_chat.c: display "No message sent" if a send page is aborted.
  Closes bug #2 in bugzilla.
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 042f1621b..96b1af234 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 1.433  1999/12/29 04:44:00  ajc
+* client_chat.c: display "No message sent" if a send page is aborted.
+  Closes bug #2 in bugzilla.
+
 Revision 1.432  1999/12/26 21:50:07  ajc
 * serv_vcard: don't run hooks when not logged in (such as in SMTP sessions)
 * serv_pop3: added.  This is the skeleton for a module implementing POP3.
@@ -1507,3 +1511,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	* Initial CVS import 
 
+
diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index a8c051807..217193d78 100644
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -235,22 +235,28 @@ void page_user() {
 		pagefp = fopen(temp, "w+");
 		unlink(temp);
 		citedit(pagefp, 0L);
-		rewind(pagefp);
-		snprintf(buf, sizeof buf, "SEXP %s|-", touser);
-		serv_puts(buf);
-		serv_gets(buf);
-		if (buf[0]=='4') {
-	   		strcpy(last_paged, touser);
-			while (fgets(buf, 256, pagefp) != NULL) {
-				buf[strlen(buf)-1] = 0;
-				serv_puts(buf);
-				}
-			fclose(pagefp);
-			serv_puts("000");
-			printf("Message sent.\n");
-		}
+		fseek(pagefp, 0L, SEEK_END);
+		if ( ftell(pagefp) > 2)  {
+			rewind(pagefp);
+			snprintf(buf, sizeof buf, "SEXP %s|-", touser);
+			serv_puts(buf);
+			serv_gets(buf);
+			if (buf[0]=='4') {
+	   			strcpy(last_paged, touser);
+				while (fgets(buf, 256, pagefp) != NULL) {
+					buf[strlen(buf)-1] = 0;
+					serv_puts(buf);
+					}
+				fclose(pagefp);
+				serv_puts("000");
+				printf("Message sent.\n");
+			}
+			else {
+				printf("%s\n", &buf[4]);
+			}
+		} 
 		else {
-			printf("%s\n", &buf[4]);
+			printf("No message sent.\n");
 		}
 	}
 }