From 9707986d30b33e5b652c8d26931c94908632e565 Mon Sep 17 00:00:00 2001 From: erdgeist <> Date: Sat, 13 Dec 2003 12:14:10 +0000 Subject: Last change to external port representation revoked. --- Makefile | 13 ------------- sample-count.fmt | 4 ++-- sample-devlog.fmt | 4 ++-- sample-erdgeist.fmt | 4 ++-- sample-mAsq.fmt | 4 ++-- sample-oldstyle.fmt | 2 +- sample-xzivi.fmt | 4 ++-- vchat-config.h | 4 ++-- vchat-protocol.c | 6 +++--- 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. all: vchat-client #vchat-client.1 - @echo " ***************************************" - @echo " ** **" - @echo " ** W A R N I N G **" - @echo " ** **" - @echo " ** Internal representation of server **" - @echo " ** port has changed. If you have got **" - @echo " ** a ~/.vchat/formats laying around, **" - @echo " ** please verify, that FS_CONNECTED **" - @echo " ** and FS_CONSOLE both don't contain **" - @echo " ** '%d' and, if they do, please **" - @echo " ** change those '%d' to '%s'. **" - @echo " ** **" - @echo " ***************************************" install: vchat-client vchat-keygen vchatrc.ex 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" FS_TIME = "^5[%H:%M]-- ^0" FS_TOPICW = "[ Channel %d: %s" FS_NOTOPICW = "[ Channel %d has no topic" -FS_CONSOLE = "%s@%s:%s, use .h to get help" -FS_CONNECTED = "^2# Connected to '^6%s^2', port ^6%s^2 ..." +FS_CONSOLE = "%s@%s:%d, use .h to get help" +FS_CONNECTED = "^2# Connected to '^6%s^2', port ^6%d^2 ..." FS_TOPIC = "^2# Channel ^6%d^2 topic is: '^0%s^2'" FS_NOTOPIC = "^2# Channel ^6%d^2 has no topic" FS_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" FS_TIME = "^2[%H:%M]^0 " FS_TOPICW = "[ Channel %d: %s" FS_NOTOPICW = "[ Channel %d has no topic" -FS_CONSOLE = "%s@%s:%s, use .h to get help" -FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%s^2 ..." +FS_CONSOLE = "%s@%s:%d, use .h to get help" +FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%d^2 ..." FS_TOPIC = "^1# Channel ^6%d^2 topic is: '^0%s^2'" FS_NOTOPIC = "^1# Channel ^6%d^2 has no topic" FS_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 " FS_CONSOLETIME = "[%H:%M] " FS_TOPICW = "[ Channel %d: %s" FS_NOTOPICW = "[ Channel %d has no topic" -FS_CONSOLE = "%s@%s:%s, use .h to get help" -FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%s^2 ..." +FS_CONSOLE = "%s@%s:%d, use .h to get help" +FS_CONNECTED = "^2# Connected to '^0%s^2', port ^0%d^2 ..." FS_TOPIC = "^1# Channel ^6%d^2 topic is: '^0%s^2'" FS_NOTOPIC = "^1# Channel ^6%d^2 has no topic" FS_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" FS_TIME = "^5%H:%M^0 " FS_TOPICW = "[ Channel %d: %s" FS_NOTOPICW = "[ Channel %d has no topic" -FS_CONSOLE = "%s@%s:%s, use .h to get help" -FS_CONNECTED = "^2*^0C^2* Connected to '^6%s^2', port ^6%s^2 ..." +FS_CONSOLE = "%s@%s:%d, use .h to get help" +FS_CONNECTED = "^2*^0C^2* Connected to '^6%s^2', port ^6%d^2 ..." FS_TOPIC = "^2*^0T^2* Channel ^6%d^2 topic is: '^0%s^2'" FS_NOTOPIC = "^2*^0T^2* Channel ^6%d^2 has no topic" FS_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 " FS_TOPICW = "Channel %d: %s" FS_NOTOPICW = "Channel %d has no topic" FS_CONSOLE = "-=- VChat V0.1 -=- type .h for help -=-" -FS_CONNECTED = "^0* Connected to '%s', port %s ..." +FS_CONNECTED = "^0* Connected to '%s', port %d ..." FS_TOPIC = "^0* Channel %d topic is: '%s'" FS_NOTOPIC = "^0* Channel %d has no topic" FS_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" FS_TIME = "^4[%H:%M]^0 " FS_TOPICW = "Channel %d: %s" FS_NOTOPICW = "Channel %d has no topic" -FS_CONSOLE = "%s@%s:%s" -FS_CONNECTED = "# Connected to %s:%s ..." +FS_CONSOLE = "%s@%s:%d" +FS_CONNECTED = "# Connected to %s:%d ..." FS_TOPIC = "# Channel %d topic is: ^6%s" FS_NOTOPIC = "# Channel %d has no topic" FS_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[] = { FE( FS_CONSOLETIME, "[%H:%M] "), FE( FS_TOPICW, "[ Channel %d: %s"), FE( FS_NOTOPICW, "[ Channel %d has no topic"), - FE( FS_CONSOLE, "%s@%s:%s, use .h to get help "), - FE( FS_CONNECTED, "\0012# Connected to '\0016%s\0012', port \0016%s\0012 ..."), + FE( FS_CONSOLE, "%s@%s:%d, use .h to get help "), + FE( FS_CONNECTED, "\0012# Connected to '\0016%s\0012', port \0016%d\0012 ..."), FE( FS_TOPIC, "\0012# Channel \0016%d\0012 topic is: '\0010%s\0012'"), FE( FS_NOTOPIC, "\0012# Channel \0016%d\0012 has no topic"), 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) #endif /* inform user */ - snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CONNECTED), server, port); + snprintf (tmpstr, TMPSTRSIZE, getformatstr(FS_CONNECTED), server, strtoul(port,NULL,10)); writechan (tmpstr); usessl = getintoption(CF_USESSL); @@ -566,7 +566,7 @@ justloggedin (unsigned char *message) setstroption(CF_NICK,str1); /* show change in console window */ - snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), getstroption (CF_SERVERPORT)); + snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), strtoul(getstroption (CF_SERVERPORT),NULL,10)); consoleline (NULL); /* announce login as servermessage */ @@ -608,7 +608,7 @@ ownnickchange (unsigned char *newnick) setstroption(CF_NICK,newnick); /* show change in console window */ - snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), getintoption (CF_SERVERPORT)); + snprintf (consolestr, CONSOLESTRSIZE, getformatstr(FS_CONSOLE), nick, getstroption (CF_SERVERHOST), strtoul(getstroption (CF_SERVERPORT),NULL,10)); consoleline (NULL); } -- cgit v1.2.3