@@ -70,6 +70,7 @@ pub async fn process_shell_stream() -> Result<(), i8> {
70
70
let shell_commands = unsafe { xbd_shell_get_commands ( ) } ;
71
71
72
72
let mut stream = XbdStream :: new_with_cap ( & SD , 1 ) ;
73
+ print_aliases ( ) ;
73
74
prompt ( ) ;
74
75
75
76
while let Some ( mut line) = stream. next ( ) . await {
@@ -133,6 +134,20 @@ const ARRAY_ALIAS_ENUMERATED: &[&str] = &[
133
134
"gcoap get [::1] /const/song.txt" ,
134
135
] ;
135
136
137
+ fn print_aliases ( ) {
138
+ println ! ( "---- named aliases ----" ) ;
139
+ ARRAY_ALIAS_NAMED . iter ( )
140
+ . for_each ( |( name, cmd) | println ! ( "[{}] {}" , name, cmd) ) ;
141
+
142
+ println ! ( "---- function aliases ----" ) ;
143
+ ARRAY_ALIAS_FUNCTION . iter ( )
144
+ . for_each ( |( name, f) | println ! ( "[{}] {:?}" , name, f) ) ;
145
+
146
+ println ! ( "---- enumerated aliases ----" ) ;
147
+ ARRAY_ALIAS_ENUMERATED . iter ( ) . enumerate ( )
148
+ . for_each ( |( idx, cmd) | println ! ( "[{}] {}" , idx, cmd) ) ;
149
+ }
150
+
136
151
fn match_alias ( line : & mut ShellBuf ) -> bool {
137
152
assert ! ( line. ends_with( "\0 " ) ) ;
138
153
@@ -147,24 +162,12 @@ fn match_alias(line: &mut ShellBuf) -> bool {
147
162
let ln = & line[ ..line. len ( ) - 1 ] ; // chars that precede '\0'
148
163
149
164
if ln == "alias" || ln == "a" {
150
- println ! ( "---- named aliases ----" ) ;
151
- ARRAY_ALIAS_NAMED . iter ( )
152
- . for_each ( |( name, cmd) | println ! ( "[{}] {}" , name, cmd) ) ;
153
-
154
- println ! ( "---- function aliases ----" ) ;
155
- ARRAY_ALIAS_FUNCTION . iter ( )
156
- . for_each ( |( name, f) | println ! ( "[{}] {:?}" , name, f) ) ;
157
-
158
- println ! ( "---- enumerated aliases ----" ) ;
159
- ARRAY_ALIAS_ENUMERATED . iter ( ) . enumerate ( )
160
- . for_each ( |( idx, cmd) | println ! ( "[{}] {}" , idx, cmd) ) ;
161
-
165
+ print_aliases ( ) ;
162
166
return expand ( line, "" ) ;
163
167
} else if let Some ( item) = ARRAY_ALIAS_NAMED . iter ( ) . find ( |item| item. 0 == ln) {
164
168
return expand ( line, item. 1 ) ;
165
169
} else if let Some ( item) = ARRAY_ALIAS_FUNCTION . iter ( ) . find ( |item| item. 0 == ln) {
166
170
item. 1 ( ) ;
167
-
168
171
return expand ( line, "" ) ;
169
172
} else if let Ok ( x) = ln. parse :: < usize > ( ) {
170
173
if x < ARRAY_ALIAS_ENUMERATED . len ( ) {
0 commit comments