Re: svn commit: r306330 - head/usr.bin/mkimg

[Marcel Moolenaar]

On September 25, 2016 at 7:13:21 PM, Adrian Chadd (adrian.ch...@gmail.com) 
wrote:

Hi, 

Yeah, for portable-y stuff, I'd recommend: 

#include "endian.h" -> #ifdef __FreeBSD__ #include  
#elif __Apple__ etc, etc. 

That way we don't duplicate contents. 

Same with sys/queue.h, etc. 
We may even want to do , , etc. The compat 
directory can be shared by all build utilities that need portability.  That way 
we only have to solve portability problems once.  The name compat is but a 
suggestion.




signature.asc
Description: Message signed with OpenPGP using AMPGpg

Re: svn commit: r306330 - head/usr.bin/mkimg

[Adrian Chadd]

Hi,

Yeah, for portable-y stuff, I'd recommend:

#include "endian.h" -> #ifdef __FreeBSD__ #include 
#elif __Apple__ etc, etc.

That way we don't duplicate contents.

Same with sys/queue.h, etc.



-adrian


On 25 September 2016 at 18:06, Marcel Moolenaar  wrote:
> Author: marcel
> Date: Mon Sep 26 01:06:32 2016
> New Revision: 306330
> URL: https://svnweb.freebsd.org/changeset/base/306330
>
> Log:
>   Avoid depending on the  header for le*enc and be*enc.
>   Not only is the header unportable, the encoding/decoding functions
>   are as well.  Instead, duplicate the handful of small inlines we
>   need into a private header called endian.h.
>
>   Aside: an alternative approach is to move the encoding/decoding
>   functions to a separate system header.  While the header is still
>   nonportable, such an approach would make it possible to re-use the
>   definitions by playing games with include paths. This may be the
>   preferred approach if more (build) utilities need this.  This
>   change does not preclude that.  In fact, it makes it easier.
>
> Added:
>   head/usr.bin/mkimg/endian.h   (contents, props changed)
> Modified:
>   head/usr.bin/mkimg/apm.c
>   head/usr.bin/mkimg/bsd.c
>   head/usr.bin/mkimg/ebr.c
>   head/usr.bin/mkimg/gpt.c
>   head/usr.bin/mkimg/mbr.c
>   head/usr.bin/mkimg/pc98.c
>   head/usr.bin/mkimg/qcow.c
>   head/usr.bin/mkimg/raw.c
>   head/usr.bin/mkimg/vhd.c
>   head/usr.bin/mkimg/vmdk.c
>   head/usr.bin/mkimg/vtoc8.c
>
> Modified: head/usr.bin/mkimg/apm.c
> ==
> --- head/usr.bin/mkimg/apm.cMon Sep 26 00:41:08 2016(r306329)
> +++ head/usr.bin/mkimg/apm.cMon Sep 26 01:06:32 2016(r306330)
> @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$");
>
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
>  #include 
>
> +#include "endian.h"
>  #include "image.h"
>  #include "mkimg.h"
>  #include "scheme.h"
>
> Modified: head/usr.bin/mkimg/bsd.c
> ==
> --- head/usr.bin/mkimg/bsd.cMon Sep 26 00:41:08 2016(r306329)
> +++ head/usr.bin/mkimg/bsd.cMon Sep 26 01:06:32 2016(r306330)
> @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$");
>
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
>  #include 
>
> +#include "endian.h"
>  #include "image.h"
>  #include "mkimg.h"
>  #include "scheme.h"
>
> Modified: head/usr.bin/mkimg/ebr.c
> ==
> --- head/usr.bin/mkimg/ebr.cMon Sep 26 00:41:08 2016(r306329)
> +++ head/usr.bin/mkimg/ebr.cMon Sep 26 01:06:32 2016(r306330)
> @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$");
>
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
>  #include 
>
> +#include "endian.h"
>  #include "image.h"
>  #include "mkimg.h"
>  #include "scheme.h"
>
> Added: head/usr.bin/mkimg/endian.h
> ==
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/usr.bin/mkimg/endian.h Mon Sep 26 01:06:32 2016(r306330)
> @@ -0,0 +1,106 @@
> +/*-
> + * Copyright (c) 2002 Thomas Moestl 
> + * 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.
> + *
> + * $FreeBSD$
> + */
> +
> +#ifndef _MKIMG_ENDIAN_H_
> +#define _MKIMG_ENDIAN_H_
> +
> +static __inline uint16_t
> +be16dec(const void *pp)
> +{
> +   uint8_t const *p = (uint8_t const *)pp;
> +
> +   return ((p[0] << 8) | p[1]);
> +}
> +
> +static __inline 

svn commit: r306330 - head/usr.bin/mkimg

[Marcel Moolenaar]

Author: marcel
Date: Mon Sep 26 01:06:32 2016
New Revision: 306330
URL: https://svnweb.freebsd.org/changeset/base/306330

Log:
  Avoid depending on the  header for le*enc and be*enc.
  Not only is the header unportable, the encoding/decoding functions
  are as well.  Instead, duplicate the handful of small inlines we
  need into a private header called endian.h.
  
  Aside: an alternative approach is to move the encoding/decoding
  functions to a separate system header.  While the header is still
  nonportable, such an approach would make it possible to re-use the
  definitions by playing games with include paths. This may be the
  preferred approach if more (build) utilities need this.  This
  change does not preclude that.  In fact, it makes it easier.

Added:
  head/usr.bin/mkimg/endian.h   (contents, props changed)
Modified:
  head/usr.bin/mkimg/apm.c
  head/usr.bin/mkimg/bsd.c
  head/usr.bin/mkimg/ebr.c
  head/usr.bin/mkimg/gpt.c
  head/usr.bin/mkimg/mbr.c
  head/usr.bin/mkimg/pc98.c
  head/usr.bin/mkimg/qcow.c
  head/usr.bin/mkimg/raw.c
  head/usr.bin/mkimg/vhd.c
  head/usr.bin/mkimg/vmdk.c
  head/usr.bin/mkimg/vtoc8.c

Modified: head/usr.bin/mkimg/apm.c
==
--- head/usr.bin/mkimg/apm.cMon Sep 26 00:41:08 2016(r306329)
+++ head/usr.bin/mkimg/apm.cMon Sep 26 01:06:32 2016(r306330)
@@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
+#include "endian.h"
 #include "image.h"
 #include "mkimg.h"
 #include "scheme.h"

Modified: head/usr.bin/mkimg/bsd.c
==
--- head/usr.bin/mkimg/bsd.cMon Sep 26 00:41:08 2016(r306329)
+++ head/usr.bin/mkimg/bsd.cMon Sep 26 01:06:32 2016(r306330)
@@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
+#include "endian.h"
 #include "image.h"
 #include "mkimg.h"
 #include "scheme.h"

Modified: head/usr.bin/mkimg/ebr.c
==
--- head/usr.bin/mkimg/ebr.cMon Sep 26 00:41:08 2016(r306329)
+++ head/usr.bin/mkimg/ebr.cMon Sep 26 01:06:32 2016(r306330)
@@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
+#include "endian.h"
 #include "image.h"
 #include "mkimg.h"
 #include "scheme.h"

Added: head/usr.bin/mkimg/endian.h
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.bin/mkimg/endian.h Mon Sep 26 01:06:32 2016(r306330)
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 2002 Thomas Moestl 
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _MKIMG_ENDIAN_H_
+#define _MKIMG_ENDIAN_H_
+
+static __inline uint16_t
+be16dec(const void *pp)
+{
+   uint8_t const *p = (uint8_t const *)pp;
+
+   return ((p[0] << 8) | p[1]);
+}
+
+static __inline void
+be16enc(void *pp, uint16_t u)
+{
+   uint8_t *p = (uint8_t *)pp;
+
+   p[0] = (u >> 8) & 0xff;
+   p[1] = u & 0xff;
+}
+
+static __inline void
+be32enc(void *pp, uint32_t u)
+{
+   uint8_t *p = (uint8_t *)pp;
+
+   p[0] = (u >> 24) & 0xff;
+   p[1] = (u >> 16) & 0xff;
+   p[2] = (u >> 8) & 0xff;
+   p[3] = u & 0xff;
+}
+
+static __inline void
+be64enc(void *pp, uint64_t u)
+{
+   uint8_t *p = (uint8_t *)pp;
+
+   be32enc(p, (uint32_t)(u >> 32));
+   be32enc(p + 4, (uint32_t)(u &