summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile13
-rwxr-xr-xsample-count.fmt4
-rwxr-xr-xsample-devlog.fmt4
-rwxr-xr-xsample-erdgeist.fmt4
-rwxr-xr-xsample-mAsq.fmt4
-rwxr-xr-xsample-oldstyle.fmt2
-rwxr-xr-xsample-xzivi.fmt4
-rwxr-xr-xvchat-config.h4
-rwxr-xr-xvchat-protocol.c6
9 files changed, 16 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 5e14ccd..bca9889 100755
--- a/Makefile
+++ b/Makefile
@@ -39,19 +39,6 @@ OBJS = vchat-client.o vchat-ui.o vchat-protocol.o vchat-user.o vchat-commands.
39 39
40 40
41all: vchat-client #vchat-client.1 41all: vchat-client #vchat-client.1
42 @echo " ***************************************"
43 @echo " ** **"
44 @echo " ** W A R N I N G **"
45 @echo " ** **"
46 @echo " ** Internal representation of server **"
47 @echo " ** port has changed. If you have got **"
48 @echo " ** a ~/.vchat/formats laying around, **"
49 @echo " ** please verify, that FS_CONNECTED **"
50 @echo " ** and FS_CONSOLE both don't contain **"
51 @echo " ** '%d' and, if they do, please **"
52 @echo " ** change those '%d' to '%s'. **"
53 @echo " ** **"
54 @echo " ***************************************"
55 42
56install: vchat-client vchat-keygen vchatrc.ex 43install: vchat-client vchat-keygen vchatrc.ex
57 install -d $(DESTDIR)/etc 44 install -d $(DESTDIR)/etc
diff --git a/sample-count.fmt b/sample-count.fmt
index bab9751..d008991 100755
--- a/sample-count.fmt
+++ b/sample-count.fmt
@@ -42,8 +42,8 @@ FS_IDLE = "^8%s"
42FS_TIME = "^5[%H:%M]-- ^0" 42FS_TIME = "^5[%H:%M]-- ^0"
43FS_TOPICW = "[ Channel %d: %s" 43FS_TOPICW = "[ Channel %d: %s"
44FS_NOTOPICW = "[ Channel %d has no topic" 44FS_NOTOPICW = "[ Channel %d has no topic"
45FS_CONSOLE = "%s@%s:%s, use .h to get help" 45FS_CONSOLE = "%s@%s:%d, use .h to get help"
46FS_CONNECTED = "^2# Connected to '^6%s^2', port ^6%s^2 ..." 46FS_CONNECTED = "^2# Connected to '^6%s^2', port ^6%d^2 ..."
47FS_TOPIC = "^2# Channel ^6%d^2 topic is: '^0%s^2'" 47FS_TOPIC = "^2# Channel ^6%d^2 topic is: '^0%s^2'"
48FS_NOTOPIC = "^2# Channel ^6%d^2 has no topic" 48FS_NOTOPIC = "^2# Channel ^6%d^2 has no topic"
49FS_CHGTOPIC = "^2# ^6%s^2 changes topic to: '^0%s^2'" 49FS_CHGTOPIC = "^2# ^6%s^2 changes topic to: '^0%s^2'"
diff --git a/sample-devlog.fmt b/sample-devlog.fmt
index ac30551..e70364d 100755
--- a/sample-devlog.fmt
+++ b/sample-devlog.fmt
@@ -47,8 +47,8 @@ FS_IDLE = "^8%s"
47FS_TIME = "^2[%H:%M]^0 " 47FS_TIME = "^2[%H:%M]^0 "
48FS_TOPICW = "[ Channel %d: %s" 48FS_TOPICW = "[ Channel %d: %s"
49FS_NOTOPICW = "[ Channel %d has no topic" 49FS_NOTOPICW = "[ Channel %d has no topic"
50FS_CONSOLE = "%s@%s:%s, use .h to get help" 50FS_CONSOLE = "%s@%s:%d, use .h to get help"
51FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%s^2 ..." 51FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%d^2 ..."
52FS_TOPIC = "^1# Channel ^6%d^2 topic is: '^0%s^2'" 52FS_TOPIC = "^1# Channel ^6%d^2 topic is: '^0%s^2'"
53FS_NOTOPIC = "^1# Channel ^6%d^2 has no topic" 53FS_NOTOPIC = "^1# Channel ^6%d^2 has no topic"
54FS_CHGTOPIC = "^1# ^4%s^1 changes topic to: '^0%s^1'" 54FS_CHGTOPIC = "^1# ^4%s^1 changes topic to: '^0%s^1'"
diff --git a/sample-erdgeist.fmt b/sample-erdgeist.fmt
index 7545d3d..5fc87e1 100755
--- a/sample-erdgeist.fmt
+++ b/sample-erdgeist.fmt
@@ -42,8 +42,8 @@ FS_TIME = "^9[%H:%M]^0 "
42FS_CONSOLETIME = "[%H:%M] " 42FS_CONSOLETIME = "[%H:%M] "
43FS_TOPICW = "[ Channel %d: %s" 43FS_TOPICW = "[ Channel %d: %s"
44FS_NOTOPICW = "[ Channel %d has no topic" 44FS_NOTOPICW = "[ Channel %d has no topic"
45FS_CONSOLE = "%s@%s:%s, use .h to get help" 45FS_CONSOLE = "%s@%s:%d, use .h to get help"
46FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%s^2 ..." 46FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%d^2 ..."
47FS_TOPIC = "^1# Channel ^6%d^2 topic is: '^0%s^2'" 47FS_TOPIC = "^1# Channel ^6%d^2 topic is: '^0%s^2'"
48FS_NOTOPIC = "^1# Channel ^6%d^2 has no topic" 48FS_NOTOPIC = "^1# Channel ^6%d^2 has no topic"
49FS_CHGTOPIC = "^1# ^4%s^1 changes topic to: '^0%s^1'" 49FS_CHGTOPIC = "^1# ^4%s^1 changes topic to: '^0%s^1'"
diff --git a/sample-mAsq.fmt b/sample-mAsq.fmt
index af001d7..9bed139 100755
--- a/sample-mAsq.fmt
+++ b/sample-mAsq.fmt
@@ -42,8 +42,8 @@ FS_IDLE = "^8%s"
42FS_TIME = "^5%H:%M^0 " 42FS_TIME = "^5%H:%M^0 "
43FS_TOPICW = "[ Channel %d: %s" 43FS_TOPICW = "[ Channel %d: %s"
44FS_NOTOPICW = "[ Channel %d has no topic" 44FS_NOTOPICW = "[ Channel %d has no topic"
45FS_CONSOLE = "%s@%s:%s, use .h to get help" 45FS_CONSOLE = "%s@%s:%d, use .h to get help"
46FS_CONNECTED = "^2*^0C^2* Connected to '^6%s^2', port ^6%s^2 ..." 46FS_CONNECTED = "^2*^0C^2* Connected to '^6%s^2', port ^6%d^2 ..."
47FS_TOPIC = "^2*^0T^2* Channel ^6%d^2 topic is: '^0%s^2'" 47FS_TOPIC = "^2*^0T^2* Channel ^6%d^2 topic is: '^0%s^2'"
48FS_NOTOPIC = "^2*^0T^2* Channel ^6%d^2 has no topic" 48FS_NOTOPIC = "^2*^0T^2* Channel ^6%d^2 has no topic"
49FS_CHGTOPIC = "^5*^0T^2* ^6%s^2 changes topic to: '^0%s^2'" 49FS_CHGTOPIC = "^5*^0T^2* ^6%s^2 changes topic to: '^0%s^2'"
diff --git a/sample-oldstyle.fmt b/sample-oldstyle.fmt
index d0d8f17..a1b0eb5 100755
--- a/sample-oldstyle.fmt
+++ b/sample-oldstyle.fmt
@@ -43,7 +43,7 @@ FS_TIME = "^0%H:%M "
43FS_TOPICW = "Channel %d: %s" 43FS_TOPICW = "Channel %d: %s"
44FS_NOTOPICW = "Channel %d has no topic" 44FS_NOTOPICW = "Channel %d has no topic"
45FS_CONSOLE = "-=- VChat V0.1 -=- type .h for help -=-" 45FS_CONSOLE = "-=- VChat V0.1 -=- type .h for help -=-"
46FS_CONNECTED = "^0* Connected to '%s', port %s ..." 46FS_CONNECTED = "^0* Connected to '%s', port %d ..."
47FS_TOPIC = "^0* Channel %d topic is: '%s'" 47FS_TOPIC = "^0* Channel %d topic is: '%s'"
48FS_NOTOPIC = "^0* Channel %d has no topic" 48FS_NOTOPIC = "^0* Channel %d has no topic"
49FS_CHGTOPIC = "^0* %s changed the channel topic to '%s'" 49FS_CHGTOPIC = "^0* %s changed the channel topic to '%s'"
diff --git a/sample-xzivi.fmt b/sample-xzivi.fmt
index dbbf2b4..f839366 100755
--- a/sample-xzivi.fmt
+++ b/sample-xzivi.fmt
@@ -41,8 +41,8 @@ FS_IDLE = "^1^b%s^B"
41FS_TIME = "^4[%H:%M]^0 " 41FS_TIME = "^4[%H:%M]^0 "
42FS_TOPICW = "Channel %d: %s" 42FS_TOPICW = "Channel %d: %s"
43FS_NOTOPICW = "Channel %d has no topic" 43FS_NOTOPICW = "Channel %d has no topic"
44FS_CONSOLE = "%s@%s:%s" 44FS_CONSOLE = "%s@%s:%d"
45FS_CONNECTED = "# Connected to %s:%s ..." 45FS_CONNECTED = "# Connected to %s:%d ..."
46FS_TOPIC = "# Channel %d topic is: ^6%s" 46FS_TOPIC = "# Channel %d topic is: ^6%s"
47FS_NOTOPIC = "# Channel %d has no topic" 47FS_NOTOPIC = "# Channel %d has no topic"
48FS_CHGTOPIC = "# ^b%s^B changes topic to: ^6%s" 48FS_CHGTOPIC = "# ^b%s^B changes topic to: ^6%s"
diff --git a/vchat-config.h b/vchat-config.h
index f011a4c..c25c3cb 100755
--- a/vchat-config.h
+++ b/vchat-config.h
@@ -96,8 +96,8 @@ static formatstring formatstrings[] = {
96 FE( FS_CONSOLETIME, "[%H:%M] "), 96 FE( FS_CONSOLETIME, "[%H:%M] "),
97 FE( FS_TOPICW, "[ Channel %d: %s"), 97 FE( FS_TOPICW, "[ Channel %d: %s"),
98 FE( FS_NOTOPICW, "[ Channel %d has no topic"), 98 FE( FS_NOTOPICW, "[ Channel %d has no topic"),
99 FE( FS_CONSOLE, "%s@%s:%s, use .h to get help "), 99 FE( FS_CONSOLE, "%s@%s:%d, use .h to get help "),
100 FE( FS_CONNECTED, "\0012# Connected to '\0016%s\0012', port \0016%s\0012 ..."), 100 FE( FS_CONNECTED, "\0012# Connected to '\0016%s\0012', port \0016%d\0012 ..."),
101 FE( FS_TOPIC, "\0012# Channel \0016%d\0012 topic is: '\0010%s\0012'"), 101 FE( FS_TOPIC, "\0012# Channel \0016%d\0012 topic is: '\0010%s\0012'"),
102 FE( FS_NOTOPIC, "\0012# Channel \0016%d\0012 has no topic"), 102 FE( FS_NOTOPIC, "\0012# Channel \0016%d\0012 has no topic"),
103 FE( FS_CHGTOPIC, "\0012# \0016%s\0012 changes topic to: '\0010%s\0012'"), 103 FE( FS_CHGTOPIC, "\0012# \0016%s\0012 changes topic to: '\0010%s\0012'"),
diff --git a/vchat-protocol.c b/vchat-protocol.c
index 03161e0..0dfcf25 100755
--- a/vchat-protocol.c
+++ b/vchat-protocol.c
@@ -163,7 +163,7 @@ vcconnect (unsigned char *server, unsigned char *port)
163#endif 163#endif
164 164
165 /* inform user */ 165 /* inform user */
166 snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CONNECTED), server, port); 166 snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CONNECTED), server, strtoul(port,NULL,10));
167 writechan (tmpstr); 167 writechan (tmpstr);
168 168
169 usessl = getintoption(CF_USESSL); 169 usessl = getintoption(CF_USESSL);
@@ -566,7 +566,7 @@ justloggedin (unsigned char *message)
566 setstroption(CF_NICK,str1); 566 setstroption(CF_NICK,str1);
567 567
568 /* show change in console window */ 568 /* show change in console window */
569 snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), getstroption (CF_SERVERPORT)); 569 snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), strtoul(getstroption (CF_SERVERPORT),NULL,10));
570 consoleline (NULL); 570 consoleline (NULL);
571 571
572 /* announce login as servermessage */ 572 /* announce login as servermessage */
@@ -608,7 +608,7 @@ ownnickchange (unsigned char *newnick)
608 setstroption(CF_NICK,newnick); 608 setstroption(CF_NICK,newnick);
609 609
610 /* show change in console window */ 610 /* show change in console window */
611 snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), getintoption (CF_SERVERPORT)); 611 snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), strtoul(getstroption (CF_SERVERPORT),NULL,10));
612 consoleline (NULL); 612 consoleline (NULL);
613} 613}
614 614