xiaoxiang781216 commented on code in PR #1654: URL: https://github.com/apache/nuttx-apps/pull/1654#discussion_r1143757974
########## nshlib/nsh_console.h: ########## @@ -153,6 +155,15 @@ struct console_stdio_s size_t varsz; #endif +#ifdef CONFIG_NSH_ALIAS Review Comment: it's better to move into nsh_vtbl_s, so all possible console can get alias support automatically ########## nshlib/nsh_alias.c: ########## @@ -0,0 +1,458 @@ +/**************************************************************************** + * 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) \ Review Comment: let's merge ALIAS_INIT check to alias_init and remove do_alias_init ########## nshlib/nsh_alias.c: ########## @@ -0,0 +1,458 @@ +/**************************************************************************** + * 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)) \ Review Comment: we can check the field in both alist and afreelist is null instead, and remove flags field and ALIAS_INIT macro. ########## nshlib/nsh.h: ########## @@ -715,6 +715,25 @@ struct nsh_parser_s #endif }; +#ifdef CONFIG_NSH_ALIAS +struct nsh_alias_s +{ + FAR struct nsh_alias_s *next; /* Single link list for traversing */ + FAR char *name; /* Name of the alias */ + FAR char *value; /* Value behind the name */ + union + { + struct + { + uint8_t exp : 1; /* Already expanded ? */ Review Comment: why need exp? -- 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
