You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/08/06 13:36:46 UTC
[incubator-nuttx] branch master updated (385e555 -> b6194bc)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 385e555 wireless: gs2200m: Add flags member
new bca0f3e sys/stat:Make comment match code
new fbd5712 Fix Breakage from 91ed14c6
new b6194bc tools/gencromfs: partial fix coding standard violation
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
include/sys/stat.h | 7 +--
tools/gencromfs.c | 167 +++++++++++++++++++++++++++++++++++------------------
2 files changed, 113 insertions(+), 61 deletions(-)
[incubator-nuttx] 03/03: tools/gencromfs: partial fix coding
standard violation
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit b6194bc0bf7109fb024183b18cd84fdd4f15eb65
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Thu Aug 6 03:30:40 2020 -0700
tools/gencromfs: partial fix coding standard violation
Remaining violation seem to be an issue with the
tool parsing outptr[- lit - 1] = lit - 1
---
tools/gencromfs.c | 137 +++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 95 insertions(+), 42 deletions(-)
diff --git a/tools/gencromfs.c b/tools/gencromfs.c
index d480149..7f29f41 100644
--- a/tools/gencromfs.c
+++ b/tools/gencromfs.c
@@ -274,7 +274,8 @@ static FILE *open_tmpfile(void);
static void unlink_tmpfiles(void);
#endif
static void append_tmpfile(FILE *dest, FILE *src);
-static void dump_hexbuffer(FILE *stream, const void *buffer, unsigned int nbytes);
+static void dump_hexbuffer(FILE *stream, const void *buffer,
+ unsigned int nbytes);
static void dump_nextline(FILE *stream);
static size_t lzf_compress(const uint8_t *inbuffer, unsigned int inlen,
union lzf_result_u *result);
@@ -319,9 +320,9 @@ static void verify_directory(void)
/* Trim any trailing '/' characters from the directory path. */
len = strlen(g_dirname);
- while (len > 1 && g_dirname[len-1] == '/')
+ while (len > 1 && g_dirname[len - 1] == '/')
{
- g_dirname[len-1] = '\0';
+ g_dirname[len - 1] = '\0';
len--;
}
@@ -380,7 +381,9 @@ static void verify_outfile(void)
}
}
- /* Something exists at this path. Verify that the destination is a regular file */
+ /* Something exists at this path. Verify that the destination is a regular
+ * file
+ */
else if (!S_ISREG(buf.st_mode))
{
@@ -399,34 +402,78 @@ static void init_outfile(void)
fprintf(g_outstream, "/%s\n", g_delim);
fprintf(g_outstream, " * %s\n", g_outname);
fprintf(g_outstream, " *\n");
- fprintf(g_outstream, " * Copyright (C) 2018 Gregory Nutt. All rights reserved.\n");
- fprintf(g_outstream, " * Author: Gregory Nutt <gn...@nuttx.org>\n");
+ fprintf(g_outstream,
+ " * Copyright (C) 2018, 2020 Gregory Nutt. All rights "
+ "reserved.\n");
+ fprintf(g_outstream, " * Authors: Gregory Nutt <gn...@nuttx.org>\n");
+ fprintf(g_outstream, " * David Sidrane <david.sidrane@nscdg."
+ "com>\n");
fprintf(g_outstream, " *\n");
- fprintf(g_outstream, " * Redistribution and use in source and binary forms, with or without\n");
- fprintf(g_outstream, " * modification, are permitted provided that the following conditions\n");
+ fprintf(g_outstream,
+ " * Redistribution and use in source and binary forms, "
+ "with or without\n");
+ fprintf(g_outstream,
+ " * modification, are permitted provided that the following "
+ "conditions\n");
fprintf(g_outstream, " * are met:\n");
fprintf(g_outstream, " *\n");
- fprintf(g_outstream, " * 1. Redistributions of source code must retain the above copyright\n");
- fprintf(g_outstream, " * notice, this list of conditions and the following disclaimer.\n");
- fprintf(g_outstream, " * 2. Redistributions in binary form must reproduce the above copyright\n");
- fprintf(g_outstream, " * notice, this list of conditions and the following disclaimer in\n");
- fprintf(g_outstream, " * the documentation and/or other materials provided with the\n");
+ fprintf(g_outstream,
+ " * 1. Redistributions of source code must retain the above "
+ "copyright\n");
+ fprintf(g_outstream,
+ " * notice, this list of conditions and the following "
+ "disclaimer.\n");
+ fprintf(g_outstream,
+ " * 2. Redistributions in binary form must reproduce the above "
+ "copyright\n");
+ fprintf(g_outstream,
+ " * notice, this list of conditions and the following "
+ "disclaimer in\n");
+ fprintf(g_outstream,
+ " * the documentation and/or other materials provided with "
+ "the\n");
fprintf(g_outstream, " * distribution.\n");
- fprintf(g_outstream, " * 3. Neither the name NuttX nor the names of its contributors may be\n");
- fprintf(g_outstream, " * used to endorse or promote products derived from this software\n");
+ fprintf(g_outstream,
+ " * 3. Neither the name NuttX nor the names of its contributors "
+ "may be\n");
+ fprintf(g_outstream,
+ " * used to endorse or promote products derived from this "
+ "software\n");
fprintf(g_outstream, " * without specific prior written permission.\n");
fprintf(g_outstream, " *\n");
- fprintf(g_outstream, " * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n");
- fprintf(g_outstream, " * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n");
- fprintf(g_outstream, " * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n");
- fprintf(g_outstream, " * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n");
- fprintf(g_outstream, " * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n");
- fprintf(g_outstream, " * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n");
- fprintf(g_outstream, " * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS\n");
- fprintf(g_outstream, " * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED\n");
- fprintf(g_outstream, " * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n");
- fprintf(g_outstream, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n");
- fprintf(g_outstream, " * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n");
+ fprintf(g_outstream,
+ " * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND "
+ "CONTRIBUTORS\n");
+ fprintf(g_outstream,
+ " * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, "
+ "BUT NOT\n");
+ fprintf(g_outstream,
+ " * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND "
+ "FITNESS\n");
+ fprintf(g_outstream,
+ " * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL "
+ "THE\n");
+ fprintf(g_outstream,
+ " * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, "
+ "INDIRECT,\n");
+ fprintf(g_outstream,
+ " * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES "
+ "(INCLUDING,\n");
+ fprintf(g_outstream,
+ " * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR "
+ "SERVICES; LOSS\n");
+ fprintf(g_outstream,
+ " * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER "
+ "CAUSED\n");
+ fprintf(g_outstream,
+ " * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, "
+ "STRICT\n");
+ fprintf(g_outstream,
+ " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) "
+ "ARISING IN\n");
+ fprintf(g_outstream,
+ " * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF "
+ "THE\n");
fprintf(g_outstream, " * POSSIBILITY OF SUCH DAMAGE.\n");
fprintf(g_outstream, " *\n");
fprintf(g_outstream, " %s/\n\n", g_delim);
@@ -452,7 +499,8 @@ static FILE *open_tmpfile(void)
fd = mkstemp(TMP_NAME);
if (fd < 0)
{
- fprintf(stderr, "Failed to create temporary file: %s\n", strerror(errno));
+ fprintf(stderr, "Failed to create temporary file: %s\n",
+ strerror(errno));
exit(1);
}
@@ -618,7 +666,7 @@ static size_t lzf_compress(const uint8_t *inbuffer, unsigned int inlen,
outptr[- lit - 1] = lit - 1; /* Stop run */
outptr -= !lit; /* Undo run if length is zero */
- for (;;)
+ for (; ; )
{
if (maxlen > 16)
{
@@ -737,7 +785,7 @@ static size_t lzf_compress(const uint8_t *inbuffer, unsigned int inlen,
}
else
{
- *outptr++ = (off >> 8) + ( 7 << 5);
+ *outptr++ = (off >> 8) + (7 << 5);
*outptr++ = len - 7;
}
@@ -778,7 +826,7 @@ static size_t lzf_compress(const uint8_t *inbuffer, unsigned int inlen,
if (lit == LZF_MAX_LIT)
{
outptr[- lit - 1] = lit - 1; /* Stop run */
- lit = 0;; /* Start run */
+ lit = 0; /* Start run */
outptr++;
}
}
@@ -799,7 +847,7 @@ static size_t lzf_compress(const uint8_t *inbuffer, unsigned int inlen,
if (lit == LZF_MAX_LIT)
{
outptr[- lit - 1] = lit - 1; /* Stop run */
- lit = 0; /* Start run */
+ lit = 0; /* Start run */
outptr++;
}
}
@@ -825,7 +873,7 @@ genhdr:
}
else
{
- /* Write uncompressed header*/
+ /* Write uncompressed header */
result->uncompressed.lzf_magic[0] = 'Z';
result->uncompressed.lzf_magic[1] = 'V';
@@ -977,9 +1025,9 @@ static void gen_directory(const char *path, const char *name, mode_t mode,
traverse_directory(path, process_direntry, NULL);
}
- /* When traverse_directory() returns, all of the nodes in the sub-tree under
- * 'name' will have been written to the new tmpfile. g_offset is correct,
- * but other settings are not.
+ /* When traverse_directory() returns, all of the nodes in the sub-tree
+ * under 'name' will have been written to the new tmpfile. g_offset is
+ * correct, but other settings are not.
*
* Restore the state.
*/
@@ -1010,7 +1058,9 @@ static void gen_directory(const char *path, const char *name, mode_t mode,
g_nnodes++;
- /* Now append the sub-tree nodes in the new tmpfile to the previous tmpfile */
+ /* Now append the sub-tree nodes in the new tmpfile to the previous
+ * tmpfile
+ */
append_tmpfile(g_tmpstream, subtree_stream);
}
@@ -1083,8 +1133,8 @@ static void gen_file(const char *path, const char *name, mode_t mode,
dump_nextline(g_tmpstream);
fprintf(g_tmpstream,
"\n /* Offset %6lu: "
- "Block %u blklen=%lu Uncompressed=%lu Compressed=%u */\n\n",
- (unsigned long)g_offset, blkno, (long)blklen,
+ "Block %u blklen=%lu Uncompressed=%lu Compressed=%u "
+ "*/\n\n", (unsigned long)g_offset, blkno, (long)blklen,
(long)nread, clen);
dump_hexbuffer(g_tmpstream, &result, blklen);
@@ -1130,7 +1180,9 @@ static void gen_file(const char *path, const char *name, mode_t mode,
g_nnodes++;
- /* Now append the sub-tree nodes in the new tmpfile to the previous tmpfile */
+ /* Now append the sub-tree nodes in the new tmpfile to the previous
+ * tmpfiles
+ */
append_tmpfile(g_tmpstream, outstream);
}
@@ -1181,7 +1233,8 @@ static int process_direntry(const char *dirpath, const char *name,
int errcode = errno;
if (errcode == ENOENT)
{
- fprintf(stderr, "ERROR: Directory entry %s does not exist\n", path);
+ fprintf(stderr, "ERROR: Directory entry %s does not exist\n",
+ path);
}
else
{
@@ -1290,7 +1343,7 @@ int main(int argc, char **argv, char **envp)
g_outname = argv[2];
verify_directory();
- verify_outfile();;
+ verify_outfile();
g_outstream = fopen(g_outname, "w");
if (!g_outstream)
@@ -1352,7 +1405,7 @@ int main(int argc, char **argv, char **envp)
/* Finally append the nodes to the output file */
- append_tmpfile(g_outstream,g_tmpstream);
+ append_tmpfile(g_outstream, g_tmpstream);
fprintf(g_outstream, "\n};\n");
fclose(g_outstream);
[incubator-nuttx] 02/03: Fix Breakage from 91ed14c6
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit fbd5712761b88ab56d4fcc38aa818a93fc247930
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Thu Aug 6 03:19:58 2020 -0700
Fix Breakage from 91ed14c6
PR 1372 vfs/stat: Make the flag defintion more confirm POSIX
standard. Silently broke the cromfs. This was due to the
necessary replication of the S_xxxx flags of the NuttX
sys/stat.h. The unfortunate outcome was most likely caused by
fact, that a grep of S_xxxx did not match the tools/gencromfs.c
To insure this sort of thing does not happen again, comments
have been added the will match search.
---
tools/gencromfs.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/gencromfs.c b/tools/gencromfs.c
index 7111ad7..d480149 100644
--- a/tools/gencromfs.c
+++ b/tools/gencromfs.c
@@ -1,8 +1,9 @@
/****************************************************************************
* tools/gencromfs.c
*
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * Copyright (C) 2018, 2020 Gregory Nutt. All rights reserved.
+ * Authors: Gregory Nutt <gn...@nuttx.org>
+ * David Sidrane <da...@nscdg.com>
*
* The function lzf_compress() comes from the file lzf_c.c (which substantial
* modification):
@@ -86,28 +87,27 @@
# define TMP_NAME "/tmp/gencromfs-%06u"
#endif
-#define NUTTX_IXOTH (1 << 0) /* Bits 0-2: Permissions for others: RWX */
-#define NUTTX_IWOTH (1 << 1)
-#define NUTTX_IROTH (1 << 2)
+#define NUTTX_IXOTH (1 << 0) /* Must match NuttX's S_IXOTH */
+#define NUTTX_IWOTH (1 << 1) /* Must match NuttX's S_IWOTH */
+#define NUTTX_IROTH (1 << 2) /* Must match NuttX's S_IROTH */
#define NUTTX_IRXOTH (NUTTX_IROTH | NUTTX_IXOTH)
-#define NUTTX_IXGRP (1 << 3) /* Bits 3-5: Group permissions: RWX */
-#define NUTTX_IWGRP (1 << 4)
-#define NUTTX_IRGRP (1 << 5)
+#define NUTTX_IXGRP (1 << 3) /* Must match NuttX's S_IXGRP */
+#define NUTTX_IWGRP (1 << 4) /* Must match NuttX's S_IWGRP */
+#define NUTTX_IRGRP (1 << 5) /* Must match NuttX's S_IRGRP */
#define NUTTX_IRXGRP (NUTTX_IRGRP | NUTTX_IXGRP)
-#define NUTTX_IXUSR (1 << 6) /* Bits 6-8: Owner permissions: RWX */
-#define NUTTX_IWUSR (1 << 7)
-#define NUTTX_IRUSR (1 << 8)
+#define NUTTX_IXUSR (1 << 6) /* Must match NuttX's S_IXUSR */
+#define NUTTX_IWUSR (1 << 7) /* Must match NuttX's S_IWUSR */
+#define NUTTX_IRUSR (1 << 8) /* Must match NuttX's S_IRUSR */
#define NUTTX_IRXUSR (NUTTX_IRUSR | NUTTX_IXUSR)
-#define NUTTX_IFDIR (2 << 11)
-#define NUTTX_IFREG (4 << 11)
-
-#define NUTTX_IFLNK (1 << 15) /* Bit 15: Symbolic link */
+#define NUTTX_IFDIR (4 << 12) /* Must match NuttX's S_IFDIR */
+#define NUTTX_IFREG (8 << 12) /* Must match NuttX's S_IFREG */
+#define NUTTX_IFLNK (10 << 12) /* Must match NuttX's S_IFLNK */
#define DIR_MODEFLAGS (NUTTX_IFDIR | NUTTX_IRXUSR | NUTTX_IRXGRP | NUTTX_IRXOTH)
#define DIRLINK_MODEFLAGS (NUTTX_IFLNK | DIR_MODEFLAGS)
[incubator-nuttx] 01/03: sys/stat:Make comment match code
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit bca0f3e275cfaf2697baf1ea18e3dc539dadddff
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Thu Aug 6 03:16:33 2020 -0700
sys/stat:Make comment match code
---
include/sys/stat.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 6ee05eb..2939189 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -38,14 +38,13 @@
* that the full size of a mode_t is 16-bits. (However, mode_t must be size
* 'int' because it is promoted to size int when passed in varargs).
*
- * LTTT ...U UUGG GOOO
+ * TTTT ...U UUGG GOOO
*
* Bits 0-2: Permissions for others
* Bits 3-5: Group permissions
* Bits 6-8: Owner permissions
- * Bits 9-10: Not used
- * Bits 11-14: File type bits
- * Bit 15: Symbolic link
+ * Bits 9-11: Not used
+ * Bits 12-15: File type bits
*/
#define S_IXOTH (1 << 0) /* Bits 0-2: Permissions for others: RWX */