diff --git a/apps/Make.defs b/apps/Make.defs index f37a654c47..53ac7f8be5 100644 --- a/apps/Make.defs +++ b/apps/Make.defs @@ -3,7 +3,7 @@ # Common make definitions provided to all applications # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/graphics/Makefile b/apps/graphics/Makefile index 01775a2e3b..ddd26e5367 100644 --- a/apps/graphics/Makefile +++ b/apps/graphics/Makefile @@ -2,7 +2,7 @@ # apps/graphics/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/graphics/tiff/Makefile b/apps/graphics/tiff/Makefile index 617717c65c..af487c1a9c 100644 --- a/apps/graphics/tiff/Makefile +++ b/apps/graphics/tiff/Makefile @@ -2,7 +2,7 @@ # apps/graphics/tiff/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/graphics/tiff/tiff_addstrip.c b/apps/graphics/tiff/tiff_addstrip.c index fa2a50e72a..7b5c4fb8f7 100644 --- a/apps/graphics/tiff/tiff_addstrip.c +++ b/apps/graphics/tiff/tiff_addstrip.c @@ -2,7 +2,7 @@ * apps/graphics/tiff/tiff_addstrip.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/graphics/tiff/tiff_finalize.c b/apps/graphics/tiff/tiff_finalize.c index 0d7a222a56..abae79b638 100644 --- a/apps/graphics/tiff/tiff_finalize.c +++ b/apps/graphics/tiff/tiff_finalize.c @@ -2,7 +2,7 @@ * apps/graphics/tiff/tiff_finalize.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/graphics/tiff/tiff_initialize.c b/apps/graphics/tiff/tiff_initialize.c index 3e1328eb2c..ddd5fc29d3 100644 --- a/apps/graphics/tiff/tiff_initialize.c +++ b/apps/graphics/tiff/tiff_initialize.c @@ -2,7 +2,7 @@ * apps/graphics/tiff/tiff_initialize.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/graphics/tiff/tiff_internal.h b/apps/graphics/tiff/tiff_internal.h index 5596122fa3..c7226e04d6 100644 --- a/apps/graphics/tiff/tiff_internal.h +++ b/apps/graphics/tiff/tiff_internal.h @@ -2,7 +2,7 @@ * apps/graphics/tiff/tiff_internal.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/graphics/tiff/tiff_utils.c b/apps/graphics/tiff/tiff_utils.c index c326d0274b..33886d7965 100644 --- a/apps/graphics/tiff/tiff_utils.c +++ b/apps/graphics/tiff/tiff_utils.c @@ -2,7 +2,7 @@ * apps/graphics/tiff/tiff_utils.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/interpreters/Makefile b/apps/interpreters/Makefile index 1ef9c7439c..5901fc8309 100644 --- a/apps/interpreters/Makefile +++ b/apps/interpreters/Makefile @@ -2,7 +2,7 @@ # apps/interpreters/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/interpreters/ficl/Makefile b/apps/interpreters/ficl/Makefile index 183246b67a..fb953964e1 100644 --- a/apps/interpreters/ficl/Makefile +++ b/apps/interpreters/ficl/Makefile @@ -2,7 +2,7 @@ # apps/interpreters/ficl/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/namedapp/Makefile b/apps/namedapp/Makefile index fba8fb1ff9..6b0fd6a053 100644 --- a/apps/namedapp/Makefile +++ b/apps/namedapp/Makefile @@ -2,7 +2,7 @@ # apps/nshlib/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/namedapp/namedapp.c b/apps/namedapp/namedapp.c index a5c2bee0e2..d59ce6e3b7 100644 --- a/apps/namedapp/namedapp.c +++ b/apps/namedapp/namedapp.c @@ -4,7 +4,7 @@ * Copyright (C) 2011 Uros Platise. All rights reserved. * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Authors: Uros Platise - * Gregory Nutt + * Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index d5f1f90c54..29e5bd4f2b 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -2,7 +2,7 @@ # apps/netutils/dhcpc/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/Makefile b/apps/netutils/ftpc/Makefile index 59121e3b75..723179131d 100644 --- a/apps/netutils/ftpc/Makefile +++ b/apps/netutils/ftpc/Makefile @@ -2,7 +2,7 @@ # apps/netutils/ftpc/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_cdup.c b/apps/netutils/ftpc/ftpc_cdup.c index 2b4aa0973e..d65b5789f0 100644 --- a/apps/netutils/ftpc/ftpc_cdup.c +++ b/apps/netutils/ftpc/ftpc_cdup.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_cdup.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_chdir.c b/apps/netutils/ftpc/ftpc_chdir.c index 9b512a1f38..1b95ddad4d 100644 --- a/apps/netutils/ftpc/ftpc_chdir.c +++ b/apps/netutils/ftpc/ftpc_chdir.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_chdir.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_chmod.c b/apps/netutils/ftpc/ftpc_chmod.c index 13d06f4033..e5cd48b467 100644 --- a/apps/netutils/ftpc/ftpc_chmod.c +++ b/apps/netutils/ftpc/ftpc_chmod.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_chmod.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_cmd.c b/apps/netutils/ftpc/ftpc_cmd.c index dc031790dc..cb1f9e4963 100644 --- a/apps/netutils/ftpc/ftpc_cmd.c +++ b/apps/netutils/ftpc/ftpc_cmd.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_cmd.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_config.h b/apps/netutils/ftpc/ftpc_config.h index 9dc90085ce..8e8fbd2d9a 100644 --- a/apps/netutils/ftpc/ftpc_config.h +++ b/apps/netutils/ftpc/ftpc_config.h @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_config.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_connect.c b/apps/netutils/ftpc/ftpc_connect.c index f36fa08e13..4fa8178a72 100644 --- a/apps/netutils/ftpc/ftpc_connect.c +++ b/apps/netutils/ftpc/ftpc_connect.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_connect.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_disconnect.c b/apps/netutils/ftpc/ftpc_disconnect.c index b2855ea377..ce345a890b 100644 --- a/apps/netutils/ftpc/ftpc_disconnect.c +++ b/apps/netutils/ftpc/ftpc_disconnect.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_disconnect.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_filesize.c b/apps/netutils/ftpc/ftpc_filesize.c index d827f736e5..69578d66cb 100644 --- a/apps/netutils/ftpc/ftpc_filesize.c +++ b/apps/netutils/ftpc/ftpc_filesize.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_filesize.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_filetime.c b/apps/netutils/ftpc/ftpc_filetime.c index 6b3a1d6db0..14ce81a615 100644 --- a/apps/netutils/ftpc/ftpc_filetime.c +++ b/apps/netutils/ftpc/ftpc_filetime.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_filetime.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_getfile.c b/apps/netutils/ftpc/ftpc_getfile.c index 06532c22c7..add07125f5 100644 --- a/apps/netutils/ftpc/ftpc_getfile.c +++ b/apps/netutils/ftpc/ftpc_getfile.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_getfile.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_getreply.c b/apps/netutils/ftpc/ftpc_getreply.c index 058eaf213e..3a9952dafd 100644 --- a/apps/netutils/ftpc/ftpc_getreply.c +++ b/apps/netutils/ftpc/ftpc_getreply.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_getreply.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_help.c b/apps/netutils/ftpc/ftpc_help.c index 19041bc241..4c630b441b 100644 --- a/apps/netutils/ftpc/ftpc_help.c +++ b/apps/netutils/ftpc/ftpc_help.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_help.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_idle.c b/apps/netutils/ftpc/ftpc_idle.c index 95a94d2330..7334f195d1 100644 --- a/apps/netutils/ftpc/ftpc_idle.c +++ b/apps/netutils/ftpc/ftpc_idle.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_idle.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_internal.h b/apps/netutils/ftpc/ftpc_internal.h index 5c9d88951a..4370f8dab1 100644 --- a/apps/netutils/ftpc/ftpc_internal.h +++ b/apps/netutils/ftpc/ftpc_internal.h @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_internal.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_listdir.c b/apps/netutils/ftpc/ftpc_listdir.c index 1bfda82343..5d6c6d1560 100644 --- a/apps/netutils/ftpc/ftpc_listdir.c +++ b/apps/netutils/ftpc/ftpc_listdir.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_listdir.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_mkdir.c b/apps/netutils/ftpc/ftpc_mkdir.c index 59684f07df..32c782396c 100644 --- a/apps/netutils/ftpc/ftpc_mkdir.c +++ b/apps/netutils/ftpc/ftpc_mkdir.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_mkdir.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_noop.c b/apps/netutils/ftpc/ftpc_noop.c index 48d9ccafdb..6932b1489c 100644 --- a/apps/netutils/ftpc/ftpc_noop.c +++ b/apps/netutils/ftpc/ftpc_noop.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_noop.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_putfile.c b/apps/netutils/ftpc/ftpc_putfile.c index 517a988b18..d59c4c99eb 100644 --- a/apps/netutils/ftpc/ftpc_putfile.c +++ b/apps/netutils/ftpc/ftpc_putfile.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_putfile.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_quit.c b/apps/netutils/ftpc/ftpc_quit.c index 25ec8b16ff..7a4c2533df 100644 --- a/apps/netutils/ftpc/ftpc_quit.c +++ b/apps/netutils/ftpc/ftpc_quit.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_quit.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_rename.c b/apps/netutils/ftpc/ftpc_rename.c index f2355fdd50..abda046573 100644 --- a/apps/netutils/ftpc/ftpc_rename.c +++ b/apps/netutils/ftpc/ftpc_rename.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_rename.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_response.c b/apps/netutils/ftpc/ftpc_response.c index 275b481236..b2dcb9ae1c 100644 --- a/apps/netutils/ftpc/ftpc_response.c +++ b/apps/netutils/ftpc/ftpc_response.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_response.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_rmdir.c b/apps/netutils/ftpc/ftpc_rmdir.c index 4a2c27f48e..b83946878f 100644 --- a/apps/netutils/ftpc/ftpc_rmdir.c +++ b/apps/netutils/ftpc/ftpc_rmdir.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_rmdir.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_rpwd.c b/apps/netutils/ftpc/ftpc_rpwd.c index 091a129441..ed60cfeb0b 100644 --- a/apps/netutils/ftpc/ftpc_rpwd.c +++ b/apps/netutils/ftpc/ftpc_rpwd.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_rpwd.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_socket.c b/apps/netutils/ftpc/ftpc_socket.c index 4ec022bd03..f904688fd6 100644 --- a/apps/netutils/ftpc/ftpc_socket.c +++ b/apps/netutils/ftpc/ftpc_socket.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_socket.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_transfer.c b/apps/netutils/ftpc/ftpc_transfer.c index 464cd2a607..0eb9130f3c 100644 --- a/apps/netutils/ftpc/ftpc_transfer.c +++ b/apps/netutils/ftpc/ftpc_transfer.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_transfer.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_unlink.c b/apps/netutils/ftpc/ftpc_unlink.c index cf6733ecae..17401c280e 100644 --- a/apps/netutils/ftpc/ftpc_unlink.c +++ b/apps/netutils/ftpc/ftpc_unlink.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_unlink.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpc/ftpc_utils.c b/apps/netutils/ftpc/ftpc_utils.c index 21a466c009..50b1a6e4ef 100644 --- a/apps/netutils/ftpc/ftpc_utils.c +++ b/apps/netutils/ftpc/ftpc_utils.c @@ -2,7 +2,7 @@ * apps/netutils/ftpc/ftpc_utils.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/ftpd/ftpd.h b/apps/netutils/ftpd/ftpd.h index 6c10d35ad2..003f8d2bf4 100755 --- a/apps/netutils/ftpd/ftpd.h +++ b/apps/netutils/ftpd/ftpd.h @@ -2,7 +2,7 @@ * apps/include/ftpd.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/resolv/Makefile b/apps/netutils/resolv/Makefile index 32d0896e24..89744e3233 100644 --- a/apps/netutils/resolv/Makefile +++ b/apps/netutils/resolv/Makefile @@ -2,7 +2,7 @@ # apps/netutils/resolv/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index 758e436f33..5a43d1c9d6 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -2,7 +2,7 @@ # apps/netutils/smtp/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c index 4e66a41cb2..08ff295ef0 100644 --- a/apps/netutils/smtp/smtp.c +++ b/apps/netutils/smtp/smtp.c @@ -3,7 +3,7 @@ * smtp SMTP E-mail sender * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Heavily leveraged from uIP 1.0 which also has a BSD-like license: * diff --git a/apps/netutils/telnetd/telnetd_daemon.c b/apps/netutils/telnetd/telnetd_daemon.c index d43a45e86f..aea9eb483c 100644 --- a/apps/netutils/telnetd/telnetd_daemon.c +++ b/apps/netutils/telnetd/telnetd_daemon.c @@ -2,7 +2,7 @@ * netutils/telnetd/telnetd_daemon.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index 1ec7b2b90e..910046c11e 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -2,7 +2,7 @@ # apps/netutils/tftpc/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/tftpc/tftpc_get.c b/apps/netutils/tftpc/tftpc_get.c index 4f391806cc..697021d95d 100644 --- a/apps/netutils/tftpc/tftpc_get.c +++ b/apps/netutils/tftpc/tftpc_get.c @@ -2,7 +2,7 @@ * netuils/tftp/tftpc_get.c * * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/tftpc/tftpc_internal.h b/apps/netutils/tftpc/tftpc_internal.h index bed25a6a5c..f689ce176e 100644 --- a/apps/netutils/tftpc/tftpc_internal.h +++ b/apps/netutils/tftpc/tftpc_internal.h @@ -2,7 +2,7 @@ * netutils/tftoc/tftpc_internal.h * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/tftpc/tftpc_put.c b/apps/netutils/tftpc/tftpc_put.c index 7124bb9816..76ef18a8c5 100644 --- a/apps/netutils/tftpc/tftpc_put.c +++ b/apps/netutils/tftpc/tftpc_put.c @@ -2,7 +2,7 @@ * netuils/tftp/tftpc_put.c * * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 4978c7c791..f505125da7 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -2,7 +2,7 @@ # apps/netutils/thttpd/Makefile # # Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/cgi-src/Makefile b/apps/netutils/thttpd/cgi-src/Makefile index 46b41fd625..60efb08e7b 100644 --- a/apps/netutils/thttpd/cgi-src/Makefile +++ b/apps/netutils/thttpd/cgi-src/Makefile @@ -2,7 +2,7 @@ # apps/netutils/cgi-src/Makefile # # Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/cgi-src/phf.c b/apps/netutils/thttpd/cgi-src/phf.c index 2541481c4c..575bf85ba9 100644 --- a/apps/netutils/thttpd/cgi-src/phf.c +++ b/apps/netutils/thttpd/cgi-src/phf.c @@ -3,7 +3,7 @@ * Cracker trap * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/cgi-src/redirect.c b/apps/netutils/thttpd/cgi-src/redirect.c index 84f3b8712a..d91a715da1 100644 --- a/apps/netutils/thttpd/cgi-src/redirect.c +++ b/apps/netutils/thttpd/cgi-src/redirect.c @@ -3,7 +3,7 @@ * Simple redirection CGI program * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/cgi-src/ssi.c b/apps/netutils/thttpd/cgi-src/ssi.c index 4afb141f92..c8bdab4ed8 100644 --- a/apps/netutils/thttpd/cgi-src/ssi.c +++ b/apps/netutils/thttpd/cgi-src/ssi.c @@ -3,7 +3,7 @@ * Server-side-includes CGI program * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/config.h b/apps/netutils/thttpd/config.h index f1b4c2d4cf..d238fabd87 100644 --- a/apps/netutils/thttpd/config.h +++ b/apps/netutils/thttpd/config.h @@ -2,7 +2,7 @@ * netutils/thttpd/config.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/fdwatch.c b/apps/netutils/thttpd/fdwatch.c index 24ea7a1e08..50ea65e78d 100644 --- a/apps/netutils/thttpd/fdwatch.c +++ b/apps/netutils/thttpd/fdwatch.c @@ -3,7 +3,7 @@ * FD watcher routines for poll() * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/fdwatch.h b/apps/netutils/thttpd/fdwatch.h index e60727db17..38a5ecbc08 100644 --- a/apps/netutils/thttpd/fdwatch.h +++ b/apps/netutils/thttpd/fdwatch.h @@ -2,7 +2,7 @@ * netutils/thttpd/fdwatch.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in THTTPD: * diff --git a/apps/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c index 05831b3353..ee0ac999ce 100644 --- a/apps/netutils/thttpd/libhttpd.c +++ b/apps/netutils/thttpd/libhttpd.c @@ -3,7 +3,7 @@ * HTTP Protocol Library * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/libhttpd.h b/apps/netutils/thttpd/libhttpd.h index f2e39e04d2..b245a6edf1 100644 --- a/apps/netutils/thttpd/libhttpd.h +++ b/apps/netutils/thttpd/libhttpd.h @@ -3,7 +3,7 @@ * HTTP Protocol Library Definitions * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/mime_types.h b/apps/netutils/thttpd/mime_types.h index cd0c514a83..9581927588 100644 --- a/apps/netutils/thttpd/mime_types.h +++ b/apps/netutils/thttpd/mime_types.h @@ -6,7 +6,7 @@ * contained no copyright information. * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/tdate_parse.c b/apps/netutils/thttpd/tdate_parse.c index d9ace1b414..e91ab5ebba 100644 --- a/apps/netutils/thttpd/tdate_parse.c +++ b/apps/netutils/thttpd/tdate_parse.c @@ -3,7 +3,7 @@ * Parse string dates into internal form, stripped-down version * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/tdate_parse.h b/apps/netutils/thttpd/tdate_parse.h index 301d5467ab..eea82d7cbd 100644 --- a/apps/netutils/thttpd/tdate_parse.h +++ b/apps/netutils/thttpd/tdate_parse.h @@ -2,7 +2,7 @@ * netutils/thttpd/fdwatch.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in THTTPD: * diff --git a/apps/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c index 3b49c0141c..1b074902de 100644 --- a/apps/netutils/thttpd/thttpd.c +++ b/apps/netutils/thttpd/thttpd.c @@ -3,7 +3,7 @@ * Tiny HTTP Server * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/thttpd_alloc.c b/apps/netutils/thttpd/thttpd_alloc.c index 71c71397b4..12872f192e 100755 --- a/apps/netutils/thttpd/thttpd_alloc.c +++ b/apps/netutils/thttpd/thttpd_alloc.c @@ -2,7 +2,7 @@ * netutils/thttpd/thttpd_alloc.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/thttpd_alloc.h b/apps/netutils/thttpd/thttpd_alloc.h index 1f24bc2e95..e8c8f80c3a 100755 --- a/apps/netutils/thttpd/thttpd_alloc.h +++ b/apps/netutils/thttpd/thttpd_alloc.h @@ -2,7 +2,7 @@ * netutils/thttpd/thttpd_alloc.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c index 0c23a2587f..9c0de509bd 100755 --- a/apps/netutils/thttpd/thttpd_cgi.c +++ b/apps/netutils/thttpd/thttpd_cgi.c @@ -3,7 +3,7 @@ * CGI support * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file libhttpd.c in the original THTTPD package: * diff --git a/apps/netutils/thttpd/thttpd_cgi.h b/apps/netutils/thttpd/thttpd_cgi.h index 2d98e25ecd..47923223cb 100755 --- a/apps/netutils/thttpd/thttpd_cgi.h +++ b/apps/netutils/thttpd/thttpd_cgi.h @@ -1,61 +1,61 @@ -/**************************************************************************** - * netutils/thttpd/thttpd_cgi.h - * CGI support - * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Derived from the file libhttpd.c in the original THTTPD package: - * - * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __HTTPD_CGI_H -#define __HTTPD_CGI_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include "config.h" -#include "libhttpd.h" - -#if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN) - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -extern int cgi(httpd_conn *hc); -#if CONFIG_THTTPD_CGI_TIMELIMIT > 0 -static void cgi_kill(ClientData client_data, struct timeval *now); -#endif - -#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */ -#endif /* __HTTPD_CGI_H */ +/**************************************************************************** + * netutils/thttpd/thttpd_cgi.h + * CGI support + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Derived from the file libhttpd.c in the original THTTPD package: + * + * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __HTTPD_CGI_H +#define __HTTPD_CGI_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include "config.h" +#include "libhttpd.h" + +#if defined(CONFIG_THTTPD) && defined(CONFIG_THTTPD_CGI_PATTERN) + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +extern int cgi(httpd_conn *hc); +#if CONFIG_THTTPD_CGI_TIMELIMIT > 0 +static void cgi_kill(ClientData client_data, struct timeval *now); +#endif + +#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */ +#endif /* __HTTPD_CGI_H */ diff --git a/apps/netutils/thttpd/thttpd_strings.c b/apps/netutils/thttpd/thttpd_strings.c index 82836ee999..5795e3754c 100755 --- a/apps/netutils/thttpd/thttpd_strings.c +++ b/apps/netutils/thttpd/thttpd_strings.c @@ -1,179 +1,179 @@ -/**************************************************************************** - * netutils/thttpd/thttpd_strings.c - * HTTP strings - * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Derived from the file of the same name in the original THTTPD package: - * - * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include - -#include "config.h" -#include "thttpd_strings.h" - -#ifdef CONFIG_THTTPD - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/* This is the 'root' of the Filesystem as seen by the HTTP client */ - -const char httpd_root[] = CONFIG_THTTPD_PATH; - -/* HTPP status */ - -const char ok200title[] = "OK"; -const char ok206title[] = "Partial Content"; - -const char err302title[] = "Found"; -const char err302form[] = "The actual URL is '%s'.\n"; - -const char err304title[] = "Not Modified"; - -const char httpd_err400title[] = "Bad Request"; -const char httpd_err400form[] = "Your request has bad syntax or is inherently impossible to satisfy.\n"; - -#ifdef CONFIG_THTTPD_AUTH_FILE -const char err401title[] = "Unauthorized"; -const char err401form[] = "Authorization required for the URL '%s'.\n"; -#endif - -const char err403title[] = "Forbidden"; -#ifndef EXPLICIT_ERROR_PAGES -const char err403form[] = "You do not have permission to get URL '%s' from this server.\n"; -#endif - -const char err404title[] = "Not Found"; -const char err404form[] = "The requested URL '%s' was not found on this server.\n"; - -const char httpd_err408title[] = "Request Timeout"; -const char httpd_err408form[] = "No request appeared within a reasonable time period.\n"; - -const char err500title[] = "Internal Error"; -const char err500form[] = "There was an unusual problem serving the requested URL '%s'.\n"; - -const char err501title[] = "Not Implemented"; -const char err501form[] = "The requested method '%s' is not implemented by this server.\n"; - -const char httpd_err503title[] = "Service Temporarily Overloaded"; -const char httpd_err503form[] = "The requested URL '%s' is temporarily overloaded. Please try again later.\n"; - -/* HTML strings */ - -const char html_crlf[] = "\r\n"; -const char html_html[] = "\r\n"; -const char html_endhtml[] = "\r\n"; -const char html_hdtitle[] = ""; -const char html_titlehd[] = "\r\n"; -const char html_body[] = "\r\n"; -const char html_endbody[] = "\r\n"; -const char html_hdr2[] = "

"; -const char html_endhdr2[] = "

"; - -/**************************************************************************** - * Private Functions - ****************************************************************************/ - -static int hexit(char nibble) -{ - if (nibble >= '0' && nibble <= '9') - { - return nibble - '0'; - } - else if (nibble >= 'a' && nibble <= 'f') - { - return nibble - 'a' + 10; - } - else if (nibble >= 'A' && nibble <= 'F') - { - return nibble - 'A' + 10; - } - return 0; -} - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/* Copies and decodes a string. It's ok for from and to to be the same string. */ - -void httpd_strdecode(char *to, char *from) -{ - for (; *from != '\0'; ++to, ++from) - { - if (from[0] == '%' && isxdigit(from[1]) && isxdigit(from[2])) - { - *to = hexit(from[1]) * 16 + hexit(from[2]); - from += 2; - } - else - { - *to = *from; - } - } - *to = '\0'; -} - -/* Copies and encodes a string. */ - -#ifdef CONFIG_THTTPD_GENERATE_INDICES -static void httpd_strencode(char *to, int tosize, char *from) -{ - int tolen; - - for (tolen = 0; *from != '\0' && tolen + 4 < tosize; ++from) - { - if (isalnum(*from) || strchr("/_.-~", *from) != NULL) - { - *to = *from; - ++to; - ++tolen; - } - else - { - (void)sprintf(to, "%%%02x", (int)*from & 0xff); - to += 3; - tolen += 3; - } - } - *to = '\0'; -} -#endif /* CONFIG_THTTPD_GENERATE_INDICES */ -#endif /* CONFIG_THTTPD */ +/**************************************************************************** + * netutils/thttpd/thttpd_strings.c + * HTTP strings + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Derived from the file of the same name in the original THTTPD package: + * + * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include + +#include "config.h" +#include "thttpd_strings.h" + +#ifdef CONFIG_THTTPD + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* This is the 'root' of the Filesystem as seen by the HTTP client */ + +const char httpd_root[] = CONFIG_THTTPD_PATH; + +/* HTPP status */ + +const char ok200title[] = "OK"; +const char ok206title[] = "Partial Content"; + +const char err302title[] = "Found"; +const char err302form[] = "The actual URL is '%s'.\n"; + +const char err304title[] = "Not Modified"; + +const char httpd_err400title[] = "Bad Request"; +const char httpd_err400form[] = "Your request has bad syntax or is inherently impossible to satisfy.\n"; + +#ifdef CONFIG_THTTPD_AUTH_FILE +const char err401title[] = "Unauthorized"; +const char err401form[] = "Authorization required for the URL '%s'.\n"; +#endif + +const char err403title[] = "Forbidden"; +#ifndef EXPLICIT_ERROR_PAGES +const char err403form[] = "You do not have permission to get URL '%s' from this server.\n"; +#endif + +const char err404title[] = "Not Found"; +const char err404form[] = "The requested URL '%s' was not found on this server.\n"; + +const char httpd_err408title[] = "Request Timeout"; +const char httpd_err408form[] = "No request appeared within a reasonable time period.\n"; + +const char err500title[] = "Internal Error"; +const char err500form[] = "There was an unusual problem serving the requested URL '%s'.\n"; + +const char err501title[] = "Not Implemented"; +const char err501form[] = "The requested method '%s' is not implemented by this server.\n"; + +const char httpd_err503title[] = "Service Temporarily Overloaded"; +const char httpd_err503form[] = "The requested URL '%s' is temporarily overloaded. Please try again later.\n"; + +/* HTML strings */ + +const char html_crlf[] = "\r\n"; +const char html_html[] = "\r\n"; +const char html_endhtml[] = "\r\n"; +const char html_hdtitle[] = ""; +const char html_titlehd[] = "\r\n"; +const char html_body[] = "\r\n"; +const char html_endbody[] = "\r\n"; +const char html_hdr2[] = "

"; +const char html_endhdr2[] = "

"; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static int hexit(char nibble) +{ + if (nibble >= '0' && nibble <= '9') + { + return nibble - '0'; + } + else if (nibble >= 'a' && nibble <= 'f') + { + return nibble - 'a' + 10; + } + else if (nibble >= 'A' && nibble <= 'F') + { + return nibble - 'A' + 10; + } + return 0; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/* Copies and decodes a string. It's ok for from and to to be the same string. */ + +void httpd_strdecode(char *to, char *from) +{ + for (; *from != '\0'; ++to, ++from) + { + if (from[0] == '%' && isxdigit(from[1]) && isxdigit(from[2])) + { + *to = hexit(from[1]) * 16 + hexit(from[2]); + from += 2; + } + else + { + *to = *from; + } + } + *to = '\0'; +} + +/* Copies and encodes a string. */ + +#ifdef CONFIG_THTTPD_GENERATE_INDICES +static void httpd_strencode(char *to, int tosize, char *from) +{ + int tolen; + + for (tolen = 0; *from != '\0' && tolen + 4 < tosize; ++from) + { + if (isalnum(*from) || strchr("/_.-~", *from) != NULL) + { + *to = *from; + ++to; + ++tolen; + } + else + { + (void)sprintf(to, "%%%02x", (int)*from & 0xff); + to += 3; + tolen += 3; + } + } + *to = '\0'; +} +#endif /* CONFIG_THTTPD_GENERATE_INDICES */ +#endif /* CONFIG_THTTPD */ diff --git a/apps/netutils/thttpd/thttpd_strings.h b/apps/netutils/thttpd/thttpd_strings.h index 5bbaf7948f..dc05f62953 100755 --- a/apps/netutils/thttpd/thttpd_strings.h +++ b/apps/netutils/thttpd/thttpd_strings.h @@ -1,123 +1,123 @@ -/**************************************************************************** - * netutils/thttpd/thttpd_strings.h - * HTTP strings - * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Derived from the file of the same name in the original THTTPD package: - * - * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - ****************************************************************************/ - -#ifndef __NETUTILS_THTTPD_THTTPD_STRINGS_H -#define __NETUTILS_THTTPD_THTTPD_STRINGS_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include "config.h" - -#ifdef CONFIG_THTTPD - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/* This is the 'root' of the Filesystem as seen by the HTTP client */ - -extern const char httpd_root[]; - -/* HTPP status */ - -extern const char ok200title[]; -extern const char ok206title[]; - -extern const char err302title[]; -extern const char err302form[]; - -extern const char err304title[]; - -extern const char httpd_err400title[]; -extern const char httpd_err400form[]; - -#ifdef CONFIG_THTTPD_AUTH_FILE -extern const char err401title[]; -extern const char err401form[]; -#endif - -extern const char err403title[]; -#ifndef EXPLICIT_ERROR_PAGES -extern const char err403form[]; -#endif - -extern const char err404title[]; -extern const char err404form[]; - -extern const char httpd_err408title[]; -extern const char httpd_err408form[]; - -extern const char err500title[]; -extern const char err500form[]; - -extern const char err501title[]; -extern const char err501form[]; - -extern const char httpd_err503title[]; -extern const char httpd_err503form[]; - -/* HTML strings */ - -extern const char html_crlf[]; -extern const char html_html[]; -extern const char html_endhtml[]; -extern const char html_hdtitle[]; -extern const char html_titlehd[]; -extern const char html_body[]; -extern const char html_endbody[]; -extern const char html_hdr2[]; -extern const char html_endhdr2[]; - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/* Copies and decodes a string. It's ok for from and to to be the same string. */ - -extern void httpd_strdecode(char *to, char *from); - -/* Copies and encodes a string. */ - -#ifdef CONFIG_THTTPD_GENERATE_INDICES -extern void httpd_strencode(char *to, int tosize, char *from); -#endif - -#endif /* CONFIG_THTTPD */ -#endif /* __NETUTILS_THTTPD_THTTPD_STRINGS_H */ +/**************************************************************************** + * netutils/thttpd/thttpd_strings.h + * HTTP strings + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Derived from the file of the same name in the original THTTPD package: + * + * Copyright © 1995,1998,1999,2000,2001 by Jef Poskanzer . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __NETUTILS_THTTPD_THTTPD_STRINGS_H +#define __NETUTILS_THTTPD_THTTPD_STRINGS_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include "config.h" + +#ifdef CONFIG_THTTPD + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* This is the 'root' of the Filesystem as seen by the HTTP client */ + +extern const char httpd_root[]; + +/* HTPP status */ + +extern const char ok200title[]; +extern const char ok206title[]; + +extern const char err302title[]; +extern const char err302form[]; + +extern const char err304title[]; + +extern const char httpd_err400title[]; +extern const char httpd_err400form[]; + +#ifdef CONFIG_THTTPD_AUTH_FILE +extern const char err401title[]; +extern const char err401form[]; +#endif + +extern const char err403title[]; +#ifndef EXPLICIT_ERROR_PAGES +extern const char err403form[]; +#endif + +extern const char err404title[]; +extern const char err404form[]; + +extern const char httpd_err408title[]; +extern const char httpd_err408form[]; + +extern const char err500title[]; +extern const char err500form[]; + +extern const char err501title[]; +extern const char err501form[]; + +extern const char httpd_err503title[]; +extern const char httpd_err503form[]; + +/* HTML strings */ + +extern const char html_crlf[]; +extern const char html_html[]; +extern const char html_endhtml[]; +extern const char html_hdtitle[]; +extern const char html_titlehd[]; +extern const char html_body[]; +extern const char html_endbody[]; +extern const char html_hdr2[]; +extern const char html_endhdr2[]; + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/* Copies and decodes a string. It's ok for from and to to be the same string. */ + +extern void httpd_strdecode(char *to, char *from); + +/* Copies and encodes a string. */ + +#ifdef CONFIG_THTTPD_GENERATE_INDICES +extern void httpd_strencode(char *to, int tosize, char *from); +#endif + +#endif /* CONFIG_THTTPD */ +#endif /* __NETUTILS_THTTPD_THTTPD_STRINGS_H */ diff --git a/apps/netutils/thttpd/timers.c b/apps/netutils/thttpd/timers.c index 8edd7b21be..dc94306b0b 100644 --- a/apps/netutils/thttpd/timers.c +++ b/apps/netutils/thttpd/timers.c @@ -3,7 +3,7 @@ * Simple Timer Routines * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in the original THTTPD package: * diff --git a/apps/netutils/thttpd/timers.h b/apps/netutils/thttpd/timers.h index 2d28d35580..7c8f9f2011 100644 --- a/apps/netutils/thttpd/timers.h +++ b/apps/netutils/thttpd/timers.h @@ -3,7 +3,7 @@ * Header file for THTTPD timers package * * Copyright (C) 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Derived from the file of the same name in THTTPD: * diff --git a/apps/netutils/uiplib/Makefile b/apps/netutils/uiplib/Makefile index 52b5fe6693..e935857a08 100644 --- a/apps/netutils/uiplib/Makefile +++ b/apps/netutils/uiplib/Makefile @@ -2,7 +2,7 @@ # apps/netutils/uiplib/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_gethostaddr.c b/apps/netutils/uiplib/uip_gethostaddr.c index 7fe26e6b97..c5c70b1be5 100644 --- a/apps/netutils/uiplib/uip_gethostaddr.c +++ b/apps/netutils/uiplib/uip_gethostaddr.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_gethostaddr.c * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_getmacaddr.c b/apps/netutils/uiplib/uip_getmacaddr.c index c99bc7a7d8..f4f01a7f30 100644 --- a/apps/netutils/uiplib/uip_getmacaddr.c +++ b/apps/netutils/uiplib/uip_getmacaddr.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_getmacaddr.c * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_ipmsfilter.c b/apps/netutils/uiplib/uip_ipmsfilter.c index ccae4a6805..8b8b8e77a1 100755 --- a/apps/netutils/uiplib/uip_ipmsfilter.c +++ b/apps/netutils/uiplib/uip_ipmsfilter.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_setmultiaddr.c * * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_parsehttpurl.c b/apps/netutils/uiplib/uip_parsehttpurl.c index bda5502b79..da973b46f3 100644 --- a/apps/netutils/uiplib/uip_parsehttpurl.c +++ b/apps/netutils/uiplib/uip_parsehttpurl.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_parsehttpurl.c * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_server.c b/apps/netutils/uiplib/uip_server.c index f58f063de5..bb8efe5e6c 100644 --- a/apps/netutils/uiplib/uip_server.c +++ b/apps/netutils/uiplib/uip_server.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_server.c * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_setdraddr.c b/apps/netutils/uiplib/uip_setdraddr.c index 6ab516afae..5b7a2183ea 100644 --- a/apps/netutils/uiplib/uip_setdraddr.c +++ b/apps/netutils/uiplib/uip_setdraddr.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_setdraddr.c * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_sethostaddr.c b/apps/netutils/uiplib/uip_sethostaddr.c index 4db268783c..3cc73faed9 100644 --- a/apps/netutils/uiplib/uip_sethostaddr.c +++ b/apps/netutils/uiplib/uip_sethostaddr.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_sethostaddr.c * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uip_setnetmask.c b/apps/netutils/uiplib/uip_setnetmask.c index edce31a2a0..7ebe83f85c 100644 --- a/apps/netutils/uiplib/uip_setnetmask.c +++ b/apps/netutils/uiplib/uip_setnetmask.c @@ -2,7 +2,7 @@ * netutils/uiplib/uip_setnetmask.c * * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/netutils/uiplib/uiplib.c b/apps/netutils/uiplib/uiplib.c index 5e4fc4e186..f863b7343f 100644 --- a/apps/netutils/uiplib/uiplib.c +++ b/apps/netutils/uiplib/uiplib.c @@ -3,7 +3,7 @@ * Various uIP library functions. * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Based on uIP which also has a BSD style license: * diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index e6616e8c8a..d999d47af0 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -2,7 +2,7 @@ # apps/netutils/webclient/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/nshlib/nsh_console.h b/apps/nshlib/nsh_console.h index 8abf9154b0..53e8c78976 100644 --- a/apps/nshlib/nsh_console.h +++ b/apps/nshlib/nsh_console.h @@ -2,7 +2,7 @@ * apps/nshlib/nsh_console.h * * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile index 974c989133..7f911d81cc 100644 --- a/apps/system/free/Makefile +++ b/apps/system/free/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2011 Uros Platise. All rights reserved. # Author: Uros Platise -# Gregory Nutt +# Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/system/free/README.txt b/apps/system/free/README.txt index dd92a94ae2..1c2d380d4e 100644 --- a/apps/system/free/README.txt +++ b/apps/system/free/README.txt @@ -2,5 +2,5 @@ This application provides UNIX style memory free information. Source: NuttX - Author: Gregory Nutt + Author: Gregory Nutt Date: 17. March 2011 diff --git a/apps/system/free/free.c b/apps/system/free/free.c index 2f61a1dae3..3d9698ecbe 100644 --- a/apps/system/free/free.c +++ b/apps/system/free/free.c @@ -2,7 +2,7 @@ * apps/system/free/free.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_bus.c b/apps/system/i2c/i2c_bus.c index 07e6d2da38..a684166ff7 100644 --- a/apps/system/i2c/i2c_bus.c +++ b/apps/system/i2c/i2c_bus.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_bus.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_common.c b/apps/system/i2c/i2c_common.c index e7b27693ad..4af648c7d5 100644 --- a/apps/system/i2c/i2c_common.c +++ b/apps/system/i2c/i2c_common.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_common.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_dev.c b/apps/system/i2c/i2c_dev.c index f2b5a0e212..3d0480a15c 100644 --- a/apps/system/i2c/i2c_dev.c +++ b/apps/system/i2c/i2c_dev.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_dev.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_get.c b/apps/system/i2c/i2c_get.c index 773f2c9637..08510af4b6 100644 --- a/apps/system/i2c/i2c_get.c +++ b/apps/system/i2c/i2c_get.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_get.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_main.c b/apps/system/i2c/i2c_main.c index fbaf677aa6..0cf6786cbc 100644 --- a/apps/system/i2c/i2c_main.c +++ b/apps/system/i2c/i2c_main.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_main.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_set.c b/apps/system/i2c/i2c_set.c index 66fd8c85a0..5baf7f8354 100644 --- a/apps/system/i2c/i2c_set.c +++ b/apps/system/i2c/i2c_set.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_set.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2c_verf.c b/apps/system/i2c/i2c_verf.c index 0fa34b96e1..109e9c4ce6 100644 --- a/apps/system/i2c/i2c_verf.c +++ b/apps/system/i2c/i2c_verf.c @@ -2,7 +2,7 @@ * apps/system/i2c/i2c_verf.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/i2c/i2ctool.h b/apps/system/i2c/i2ctool.h index 9726f0083f..4ff26d03ed 100644 --- a/apps/system/i2c/i2ctool.h +++ b/apps/system/i2c/i2ctool.h @@ -2,7 +2,7 @@ * apps/system/i2c/i2ctool.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile index 4528ad44ef..71d82f34ce 100755 --- a/apps/system/install/Makefile +++ b/apps/system/install/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2011 Uros Platise. All rights reserved. # Author: Uros Platise -# Gregory Nutt +# Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/vsn/poweroff/Makefile b/apps/vsn/poweroff/Makefile index 6136810103..e58ecfa860 100644 --- a/apps/vsn/poweroff/Makefile +++ b/apps/vsn/poweroff/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2011 Uros Platise. All rights reserved. # Author: Uros Platise -# Gregory Nutt +# Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/vsn/ramtron/Makefile b/apps/vsn/ramtron/Makefile index d91a6ca1b3..d930aa92cf 100644 --- a/apps/vsn/ramtron/Makefile +++ b/apps/vsn/ramtron/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2011 Uros Platise. All rights reserved. # Author: Uros Platise -# Gregory Nutt +# Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/vsn/ramtron/ramtron.c b/apps/vsn/ramtron/ramtron.c index 0a648cc305..f1e8db100c 100644 --- a/apps/vsn/ramtron/ramtron.c +++ b/apps/vsn/ramtron/ramtron.c @@ -5,7 +5,7 @@ * Copyright (C) 2009 Gregory Nutt. All rights reserved. * * Authors: Uros Platise - * Gregory Nutt + * Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/vsn/sdcard/Makefile b/apps/vsn/sdcard/Makefile index d943b909d1..213021b257 100644 --- a/apps/vsn/sdcard/Makefile +++ b/apps/vsn/sdcard/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2011 Uros Platise. All rights reserved. # Author: Uros Platise -# Gregory Nutt +# Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/apps/vsn/sdcard/sdcard.c b/apps/vsn/sdcard/sdcard.c index 47f6c728cf..a81e8432af 100644 --- a/apps/vsn/sdcard/sdcard.c +++ b/apps/vsn/sdcard/sdcard.c @@ -5,7 +5,7 @@ * Copyright (C) 2009 Gregory Nutt. All rights reserved. * * Authors: Uros Platise - * Gregory Nutt + * Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/apps/vsn/sysinfo/Makefile b/apps/vsn/sysinfo/Makefile index f0aac6df20..b4afc8a97f 100644 --- a/apps/vsn/sysinfo/Makefile +++ b/apps/vsn/sysinfo/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2011 Uros Platise. All rights reserved. # Author: Uros Platise -# Gregory Nutt +# Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt index 02485f812d..d01ba3219a 100644 --- a/nuttx/configs/fire-stm32v2/README.txt +++ b/nuttx/configs/fire-stm32v2/README.txt @@ -778,3 +778,9 @@ Where is one of the following: > make menuconfig Then de-select "Networking Support" -> "Networking Support" + + UPDATE: The primary problem with the ENC29J60 is a v2 board issue: The + SPI FLASH and the ENC28J60 shared the same SPI chip select signal (PA4-SPI1-NSS). + In order to finish the debug of the ENC28J60, it may be necessary to lift + the SPI FLASH chip select pin from the board. + diff --git a/nuttx/net/send.c b/nuttx/net/send.c index 950b3fc0bc..8a5154191e 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -268,7 +268,7 @@ static uint16_t send_interrupt(struct uip_driver_s *dev, void *pvconn, * then the send won't actually make it out... it will be replaced with * an ARP request. * - * NOTE 1: This could an expensive check if there are a lot of entries + * NOTE 1: This could be an expensive check if there are a lot of entries * in the ARP table. Hence, we only check on the first packet -- when * snd_sent is zero. *