pussuw commented on code in PR #1654: URL: https://github.com/apache/nuttx-apps/pull/1654#discussion_r1142052695
########## nshlib/nsh_alias.c: ########## @@ -0,0 +1,454 @@ +/**************************************************************************** + * apps/nshlib/nsh_alias.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <errno.h> + +#include <nuttx/queue.h> + +#include "nsh.h" +#include "nsh_console.h" + +#ifdef CONFIG_NSH_ALIAS + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* State flags */ + +#define ALIAS_INIT 0x01 + +/* Macro to get head of alias list */ + +#define alias_head(list) (FAR struct nsh_alias_s *)sq_peek(list) +#define alias_remfirst(list) (FAR struct nsh_alias_s *)sq_remfirst(list) + +/* Initialize the alias shell container (if necessary) */ + +#define do_alias_init(vtbl) \ + do \ + { \ + if (!(((FAR struct console_stdio_s *)(vtbl))->flags & ALIAS_INIT)) \ + { \ + ((FAR struct console_stdio_s *)(vtbl))->flags |= ALIAS_INIT; \ + alias_init(vtbl); \ + } \ + } \ + while (0) + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/* Alias message format */ + +const char g_aliasfmt[] = "alias %s='%s'\n"; +const char g_savefailfmt[] = "alias %s='%s' failed\n"; + +/* Common for both alias / unalias */ + +const char g_noaliasfmt[] = "%s: %s not found\n"; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: alias_init + ****************************************************************************/ + +int alias_init(FAR struct nsh_vtbl_s *vtbl) +{ + FAR struct console_stdio_s *cn = (FAR struct console_stdio_s *)vtbl; + int i; + + sq_init(&cn->alist); + sq_init(&cn->afreelist); + + for (i = 0; i < CONFIG_NSH_ALIAS_MAX_AMOUNT; i++) + { + sq_addlast((FAR struct sq_entry_s *)&cn->atab[i], &cn->afreelist); + } + + return OK; +} + +/**************************************************************************** + * Name: alias_find + ****************************************************************************/ + +static FAR struct nsh_alias_s *alias_find(FAR struct nsh_vtbl_s *vtbl, + FAR const char *name) +{ + FAR struct console_stdio_s *cn = (FAR struct console_stdio_s *)vtbl; + FAR struct nsh_alias_s *alias; + + for (alias = alias_head(&cn->alist); alias; alias = alias->next) + { + if (strcmp(alias->name, name) == 0) + { + return alias; + } + } + + return NULL; +} + +/**************************************************************************** + * Name: alias_delete + ****************************************************************************/ + +static void alias_delete(FAR struct nsh_vtbl_s *vtbl, + FAR struct nsh_alias_s *alias) +{ + FAR struct console_stdio_s *cn = (FAR struct console_stdio_s *)vtbl; + + if (alias) + { + if (alias->exp) + { + /* Mark it for removal, but keep the data intact */ + + alias->rem = 1; + return; + } + + if (alias->name) + { + free(alias->name); + } + + if (alias->value) + { + free(alias->value); + } + + sq_rem((FAR sq_entry_t *)alias, &cn->alist); + sq_addfirst((FAR sq_entry_t *)alias, &cn->afreelist); + } +} + +/**************************************************************************** + * Name: alias_save + ****************************************************************************/ + +static int alias_save(FAR struct nsh_vtbl_s *vtbl, FAR const char *name, + FAR const char *value) +{ + FAR struct console_stdio_s *cn = (FAR struct console_stdio_s *)vtbl; + FAR struct nsh_alias_s *alias; + int ret = 0; + + if (!name || *name == '\0' || !value) + { + return ERROR; + } + + if ((alias = alias_find(vtbl, name)) != NULL) + { + /* Update the value */ + + free(alias->value); + alias->value = strdup(value); Review Comment: Yes, everything is checked on line 195, and if any strdup fails the whole alias is deleted. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org