diff options
| author | Ali Gholami Rudi <aliqrudi@gmail.com> | 2008-10-18 08:05:15 +0330 |
|---|---|---|
| committer | Shawn <sabetts@juicebox.(none)> | 2008-10-19 00:36:59 -0700 |
| commit | 03f8bba45a8d1b0236731b4aece52795c0bc1326 (patch) | |
| tree | faa91e25968a66eda5764711da715f2dc0a51bf3 /src/actions.c | |
| parent | 9ec3e80ad828e3eb35ce800b78fa73176d0d7c02 (diff) | |
| download | ratpoison-03f8bba45a8d1b0236731b4aece52795c0bc1326.zip | |
disallow duplicate group names
Diffstat (limited to 'src/actions.c')
| -rw-r--r-- | src/actions.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/actions.c b/src/actions.c index 292ffc4..c977075 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1916,7 +1916,7 @@ find_group (char *str) return group; } - group = groups_find_group_by_name (str); + group = groups_find_group_by_name (str, 0); return group; } @@ -4845,6 +4845,8 @@ cmd_gother (int interactive, struct cmdarg **args) cmdret * cmd_gnew (int interactive, struct cmdarg **args) { + if (groups_find_group_by_name (ARG_STRING (0), 1)) + return cmdret_new (RET_FAILURE, "gnew: group already exists"); set_current_group (group_add_new_group (ARG_STRING(0))); return cmdret_new (RET_SUCCESS, NULL); } @@ -4852,6 +4854,8 @@ cmd_gnew (int interactive, struct cmdarg **args) cmdret * cmd_gnewbg (int interactive, struct cmdarg **args) { + if (groups_find_group_by_name (ARG_STRING (0), 1)) + return cmdret_new (RET_FAILURE, "gnewbg: group already exists"); group_add_new_group (ARG_STRING(0)); return cmdret_new (RET_SUCCESS, NULL); } @@ -4859,6 +4863,8 @@ cmd_gnewbg (int interactive, struct cmdarg **args) cmdret * cmd_grename (int interactive, struct cmdarg **args) { + if (groups_find_group_by_name (ARG_STRING (0), 1)) + return cmdret_new (RET_FAILURE, "grename: duplicate group name"); group_rename (rp_current_group, ARG_STRING(0)); return cmdret_new (RET_SUCCESS, NULL); } |