← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/irssi/gutsy-backports

« back to all changes in this revision

Viewing changes to src/irc/core/irc-channels.c

  • Committer: Bazaar Package Importer
  • Author(s): Christian Bjälevik
  • Date: 2007-04-28 02:52:01 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070428025201-2c4swxnpn4wr7fpg
Tags: 0.8.11-0ubuntu1
* New upstream release:
  - http://www.irssi.org/news/ChangeLog
* debian/{control,compat}:
  - Bump Standards.
* debian/patches/00list:
  - Disable 05upgrade-check-binary.patch, applied upstream.
  - Disable 08doublefree.patch, applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/irc/core/irc-channels.c
69
69
        CHANNEL_SETUP_REC *schannel;
70
70
        IRC_CHANNEL_REC *chanrec;
71
71
        GString *outchans, *outkeys;
72
 
        char *channels, *keys, *key;
 
72
        char *channels, *keys, *key, *space;
73
73
        char **chanlist, **keylist, **tmp, **tmpkey, **tmpstr, *channel, *channame;
74
74
        void *free_arg;
75
75
        int use_keys, cmdlen;
82
82
                            &channels, &keys))
83
83
                return;
84
84
 
 
85
        /* keys shouldn't contain space */
 
86
        space = strchr(keys, ' ');
 
87
        if (space != NULL) {
 
88
                *space = '\0';
 
89
        }
 
90
 
85
91
        chanlist = g_strsplit(channels, ",", -1);
86
92
        keylist = g_strsplit(keys, ",", -1);
87
93