mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	commands: require set variable to start with $
This commit is contained in:
		
							parent
							
								
									c1af79532f
								
							
						
					
					
						commit
						7717c2231a
					
				
					 2 changed files with 2 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -25,23 +25,13 @@ void free_sway_variable(struct sway_variable *var) {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
struct cmd_results *cmd_set(int argc, char **argv) {
 | 
			
		||||
	char *tmp;
 | 
			
		||||
	struct cmd_results *error = NULL;
 | 
			
		||||
	if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) {
 | 
			
		||||
		return error;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (argv[0][0] != '$') {
 | 
			
		||||
		wlr_log(WLR_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
 | 
			
		||||
 | 
			
		||||
		size_t size = snprintf(NULL, 0, "$%s", argv[0]);
 | 
			
		||||
		tmp = malloc(size + 1);
 | 
			
		||||
		if (!tmp) {
 | 
			
		||||
			return cmd_results_new(CMD_FAILURE, "set", "Not possible to create variable $'%s'", argv[0]);
 | 
			
		||||
		}
 | 
			
		||||
		snprintf(tmp, size+1, "$%s", argv[0]);
 | 
			
		||||
 | 
			
		||||
		argv[0] = tmp;
 | 
			
		||||
		return cmd_results_new(CMD_INVALID, "set", "variable '%s' must start with $", argv[0]);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	struct sway_variable *var = NULL;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -51,7 +51,7 @@ The following commands may only be used in the configuration file.
 | 
			
		|||
	*wordexp*(3) for details). The same include file can only be included once;
 | 
			
		||||
	subsequent attempts will be ignored.
 | 
			
		||||
 | 
			
		||||
*set* <name> <value>
 | 
			
		||||
*set* $<name> <value>
 | 
			
		||||
	Sets variable $_name_ to _value_. You can use the new variable in the
 | 
			
		||||
	arguments of future commands.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue