diff --git a/apps/process-list/process-list.c b/apps/process-list/process-list.c index e09369f84..d968d6cb7 100644 --- a/apps/process-list/process-list.c +++ b/apps/process-list/process-list.c @@ -90,7 +90,7 @@ update_processwindow(void) CTK_WIDGET_ADD(&processwindow, &processidlabels[i]); CTK_LABEL_NEW(&processnamelabels[i], - 4, i + 1, 22, 1, (char *)p->name); + 4, i + 1, 22, 1, PROCESS_NAME_STRING(p)); CTK_WIDGET_ADD(&processwindow, &processnamelabels[i]); ++i; diff --git a/apps/shell/shell-ps.c b/apps/shell/shell-ps.c index 052b82013..c1d6643db 100644 --- a/apps/shell/shell-ps.c +++ b/apps/shell/shell-ps.c @@ -58,7 +58,7 @@ PROCESS_THREAD(shell_ps_process, ev, data) shell_output_str(&ps_command, "Processes:", ""); for(p = PROCESS_LIST(); p != NULL; p = p->next) { - shell_output_str(&ps_command, (char *)p->name, ""); + shell_output_str(&ps_command, PROCESS_NAME_STRING(p), ""); } PROCESS_END(); diff --git a/apps/webserver-nano/httpd-cgi.c b/apps/webserver-nano/httpd-cgi.c index b28e8cffe..dec9c5d02 100644 --- a/apps/webserver-nano/httpd-cgi.c +++ b/apps/webserver-nano/httpd-cgi.c @@ -359,16 +359,13 @@ make_processes(void *p) { static const char httpd_cgi_proc[] HTTPD_STRING_ATTR = "%p%s%p%s\r\n"; char name[40],tstate[20]; -#if PROCESS_CONF_NO_PROCESS_NAMES - strcpy(name, "Not Available"); -#else - strncpy(name, ((struct process *)p)->name, 40); -#endif + + strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40); petsciiconv_toascii(name, 40); httpd_strcpy(tstate,states[9 + ((struct process *)p)->state]); return httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_proc, p, name, - // *((char **)&(((struct process *)p)->thread)), - *(char **)(&(((struct process *)p)->thread)), //minimal net +// *((char **) &(((struct process *)p)->thread)), + * (char **)(&(((struct process *)p)->thread)), //minimal net tstate); } /*---------------------------------------------------------------------------*/ diff --git a/apps/webserver/httpd-cgi.c b/apps/webserver/httpd-cgi.c index eca8b83ce..c069f531a 100644 --- a/apps/webserver/httpd-cgi.c +++ b/apps/webserver/httpd-cgi.c @@ -207,8 +207,8 @@ static unsigned short make_processes(void *p) { char name[40]; - - strncpy(name, ((struct process *)p)->name, 40); + + strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40); petsciiconv_toascii(name, 40); return snprintf((char *)uip_appdata, uip_mss(), diff --git a/core/loader/dlloader.c b/core/loader/dlloader.c index 5a1957697..57e058997 100644 --- a/core/loader/dlloader.c +++ b/core/loader/dlloader.c @@ -61,7 +61,8 @@ dlloader_load(char *path, char *arg) } /* Start the process. */ - printf("Starting '%s'\n", (*p)->name); + + printf("Starting '%s'\n", PROCESS_NAME_STRING(*p)); process_start(*p, arg); return LOADER_OK; diff --git a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c index 3f2d57180..78fd68626 100644 --- a/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c +++ b/platform/avr-atmega128rfa1/apps/raven-webserver/httpd-cgi.c @@ -268,7 +268,7 @@ make_processes(void *p) static const char httpd_cgi_proc[] HTTPD_STRING_ATTR = "%p%s%p%s\r\n"; char name[40],tstate[20]; - strncpy(name, ((struct process *)p)->name, 40); + strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40); petsciiconv_toascii(name, 40); httpd_strcpy(tstate,states[9 + ((struct process *)p)->state]); return httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_proc, p, name, diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cgi.c b/platform/avr-raven/apps/raven-webserver/httpd-cgi.c index 182d0efcd..3034775c8 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd-cgi.c +++ b/platform/avr-raven/apps/raven-webserver/httpd-cgi.c @@ -269,7 +269,7 @@ make_processes(void *p) static const char httpd_cgi_proc[] HTTPD_STRING_ATTR = "%p%s%p%s\r\n"; char name[40],tstate[20]; - strncpy(name, ((struct process *)p)->name, 40); + strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40); petsciiconv_toascii(name, 40); httpd_strcpy(tstate,states[9 + ((struct process *)p)->state]); return httpd_snprintf((char *)uip_appdata, uip_mss(), httpd_cgi_proc, p, name, diff --git a/platform/pc-6001/apps/webserver-mini/httpd-cgi.c b/platform/pc-6001/apps/webserver-mini/httpd-cgi.c index fe1dc0706..a11643a05 100644 --- a/platform/pc-6001/apps/webserver-mini/httpd-cgi.c +++ b/platform/pc-6001/apps/webserver-mini/httpd-cgi.c @@ -197,7 +197,7 @@ make_processes(void *p) { char name[40]; - strncpy(name, ((struct process *)p)->name, 40); + strncpy(name, PROCESS_NAME_STRING((struct process *)p), 40); petsciiconv_toascii(name, 40); return sprintf((char *)uip_appdata,