Hello community, here is the log from the commit of package gnu-efi for openSUSE:Factory checked in at 2020-03-25 23:41:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu-efi (Old) and /work/SRC/openSUSE:Factory/.gnu-efi.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnu-efi" Wed Mar 25 23:41:26 2020 rev:30 rq:783047 version:3.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/gnu-efi/gnu-efi.changes 2018-11-28 11:09:09.951251812 +0100 +++ /work/SRC/openSUSE:Factory/.gnu-efi.new.3160/gnu-efi.changes 2020-03-25 23:41:27.287957458 +0100 @@ -1,0 +2,19 @@ +Wed Dec 11 03:23:55 UTC 2019 - Gary Ching-Pang Lin <g...@suse.com> + +- Update to gnu-efi 3.0.11 + + Revert "efilink: fix build with gcc 4.8" + + Do not include efisetjmp.h on efi.h + + efiapi.h: fix EventGroup parameter of EFI_CREATE_EVENT_EX + prototype + + Make.rules incomplete/wrong; make -r failure + + Redefine jmp_buf to comply with C calling convention + + Fix for problem with undeclared intptr_t type + + efilink: fix build with gcc 4.8 + + Fix typos + + Set '\0' properly in StrnCpy() + + Implement StrnCat() without StrnCpy() + + Set '\0' properly in StpnCpy() + + Fix conversion from 'UINTN' to 'UINT8' warnings +- Drop upstreamed gnu-efi-fix-strncpy-stpncpy-strncat.patch + +------------------------------------------------------------------- Old: ---- gnu-efi-3.0.8.tar.bz2 gnu-efi-fix-strncpy-stpncpy-strncat.patch New: ---- gnu-efi-3.0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu-efi.spec ++++++ --- /var/tmp/diff_new_pack.JpB3uX/_old 2020-03-25 23:41:28.351957806 +0100 +++ /var/tmp/diff_new_pack.JpB3uX/_new 2020-03-25 23:41:28.399957822 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnu-efi # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gnu-efi -Version: 3.0.8 +Version: 3.0.11 Release: 0 Summary: Library for EFI Applications License: BSD-3-Clause AND GPL-2.0-or-later Group: Development/Libraries/Other -Url: http://sourceforge.net/projects/gnu-efi +URL: http://sourceforge.net/projects/gnu-efi Source: http://sourceforge.net/projects/gnu-efi/files/gnu-efi-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Patch1: %{name}-fix-strncpy-stpncpy-strncat.patch BuildRequires: kernel-source BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 %ix86 x86_64 aarch64 %arm @@ -37,7 +36,6 @@ %prep %setup -q -%patch1 -p1 %build ########################## ++++++ gnu-efi-3.0.8.tar.bz2 -> gnu-efi-3.0.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/Make.rules new/gnu-efi-3.0.11/Make.rules --- old/gnu-efi-3.0.8/Make.rules 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/Make.rules 2019-10-28 12:48:52.000000000 +0100 @@ -51,8 +51,14 @@ %.o: %.c $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -%.S: %.c +%.s: %.c $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -S $< -o $@ -%.E: %.c +%.i: %.c + $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@ + +%.o: %.S + $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +%.s: %.S $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/Makefile new/gnu-efi-3.0.11/Makefile --- old/gnu-efi-3.0.8/Makefile 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/Makefile 2019-10-28 12:48:52.000000000 +0100 @@ -34,7 +34,7 @@ # SUCH DAMAGE. # -VERSION = 3.0.8 +VERSION = 3.0.11 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) SRCDIR = $(dir $(MKFILE_PATH)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/apps/setjmp.c new/gnu-efi-3.0.11/apps/setjmp.c --- old/gnu-efi-3.0.8/apps/setjmp.c 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/apps/setjmp.c 2019-10-28 12:48:52.000000000 +0100 @@ -1,6 +1,7 @@ #include <efi.h> #include <efilib.h> +#include <efisetjmp.h> EFI_STATUS efi_main( @@ -12,12 +13,12 @@ int rc; InitializeLib(image_handle, systab); - rc = setjmp(&env); + rc = setjmp(env); Print(L"setjmp() = %d\n", rc); if (rc == 3) { Print(L"3 worked\n"); - longjmp(&env, 0); + longjmp(env, 0); return 0; } @@ -26,6 +27,6 @@ return 0; } - longjmp(&env, 3); + longjmp(env, 3); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/gnuefi/Makefile new/gnu-efi-3.0.11/gnuefi/Makefile --- old/gnu-efi-3.0.8/gnuefi/Makefile 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/gnuefi/Makefile 2019-10-28 12:48:52.000000000 +0100 @@ -54,7 +54,9 @@ all: $(TARGETS) -libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) +libgnuefi.a: $(OBJS) + $(AR) $(ARFLAGS) $@ $^ + clean: rm -f $(TARGETS) *~ *.o $(OBJS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/aarch64/efibind.h new/gnu-efi-3.0.11/inc/aarch64/efibind.h --- old/gnu-efi-3.0.8/inc/aarch64/efibind.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/aarch64/efibind.h 2019-10-28 12:48:52.000000000 +0100 @@ -27,6 +27,8 @@ typedef short int16_t; typedef unsigned char uint8_t; typedef signed char int8_t; // unqualified 'char' is unsigned on ARM +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; #else #include <stdint.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/aarch64/efisetjmp_arch.h new/gnu-efi-3.0.11/inc/aarch64/efisetjmp_arch.h --- old/gnu-efi-3.0.8/inc/aarch64/efisetjmp_arch.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/aarch64/efisetjmp_arch.h 2019-10-28 12:48:52.000000000 +0100 @@ -28,6 +28,6 @@ UINT64 D13; UINT64 D14; UINT64 D15; -} ALIGN(JMPBUF_ALIGN) jmp_buf; +} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; #endif /* GNU_EFI_AARCH64_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/arm/efibind.h new/gnu-efi-3.0.11/inc/arm/efibind.h --- old/gnu-efi-3.0.8/inc/arm/efibind.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/arm/efibind.h 2019-10-28 12:48:52.000000000 +0100 @@ -27,6 +27,8 @@ typedef short int16_t; typedef unsigned char uint8_t; typedef signed char int8_t; // unqualified 'char' is unsigned on ARM +typedef uint32_t uintptr_t; +typedef int32_t intptr_t; #else #include <stdint.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/arm/efisetjmp_arch.h new/gnu-efi-3.0.11/inc/arm/efisetjmp_arch.h --- old/gnu-efi-3.0.8/inc/arm/efisetjmp_arch.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/arm/efisetjmp_arch.h 2019-10-28 12:48:52.000000000 +0100 @@ -16,6 +16,6 @@ UINT32 R12; UINT32 R13; UINT32 R14; -} ALIGN(JMPBUF_ALIGN) jmp_buf; +} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; #endif /* GNU_EFI_ARM_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/efi.h new/gnu-efi-3.0.11/inc/efi.h --- old/gnu-efi-3.0.8/inc/efi.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/efi.h 2019-10-28 12:48:52.000000000 +0100 @@ -57,6 +57,5 @@ #include "efiudp.h" #include "efitcp.h" #include "efipoint.h" -#include "efisetjmp.h" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/efiapi.h new/gnu-efi-3.0.11/inc/efiapi.h --- old/gnu-efi-3.0.8/inc/efiapi.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/efiapi.h 2019-10-28 12:48:52.000000000 +0100 @@ -576,7 +576,7 @@ IN EFI_TPL NotifyTpl, IN EFI_EVENT_NOTIFY NotifyFunction OPTIONAL, IN const VOID *NotifyContext OPTIONAL, - IN const EFI_GUID EventGroup OPTIONAL, + IN const EFI_GUID *EventGroup OPTIONAL, OUT EFI_EVENT *Event ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/efidevp.h new/gnu-efi-3.0.11/inc/efidevp.h --- old/gnu-efi-3.0.8/inc/efidevp.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/efidevp.h 2019-10-28 12:48:52.000000000 +0100 @@ -325,11 +325,11 @@ #define MSG_INFINIBAND_DP 0x09 typedef struct _INFINIBAND_DEVICE_PATH { EFI_DEVICE_PATH_PROTOCOL Header; - UINT32 ResourceFlags ; - UINT64 PortGid ; - UINT64 ServiceId ; - UINT64 TargetPortId ; - UINT64 DeviceId ; + UINT32 ResourceFlags; + UINT8 PortGid[16]; + UINT64 ServiceId; + UINT64 TargetPortId; + UINT64 DeviceId; } INFINIBAND_DEVICE_PATH; #define MSG_UART_DP 0x0e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/efierr.h new/gnu-efi-3.0.11/inc/efierr.h --- old/gnu-efi-3.0.8/inc/efierr.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/efierr.h 2019-10-28 12:48:52.000000000 +0100 @@ -58,7 +58,7 @@ #define EFI_INVALID_LANGUAGE EFIERR(32) #define EFI_COMPROMISED_DATA EFIERR(33) -#define EFI_WARN_UNKOWN_GLYPH EFIWARN(1) +#define EFI_WARN_UNKNOWN_GLYPH EFIWARN(1) #define EFI_WARN_DELETE_FAILURE EFIWARN(2) #define EFI_WARN_WRITE_FAILURE EFIWARN(3) #define EFI_WARN_BUFFER_TOO_SMALL EFIWARN(4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/efisetjmp.h new/gnu-efi-3.0.11/inc/efisetjmp.h --- old/gnu-efi-3.0.8/inc/efisetjmp.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/efisetjmp.h 2019-10-28 12:48:52.000000000 +0100 @@ -4,7 +4,7 @@ #include "eficompiler.h" #include "efisetjmp_arch.h" -extern UINTN setjmp(jmp_buf *env) __attribute__((returns_twice)); -extern VOID longjmp(jmp_buf *env, UINTN value) __attribute__((noreturn)); +extern UINTN setjmp(jmp_buf env) __attribute__((returns_twice)); +extern VOID longjmp(jmp_buf env, UINTN value) __attribute__((noreturn)); #endif /* GNU_EFI_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/ia32/efibind.h new/gnu-efi-3.0.11/inc/ia32/efibind.h --- old/gnu-efi-3.0.8/inc/ia32/efibind.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/ia32/efibind.h 2019-10-28 12:48:52.000000000 +0100 @@ -75,6 +75,8 @@ typedef unsigned char uint8_t; typedef char int8_t; #endif + typedef uint32_t uintptr_t; + typedef int32_t intptr_t; #elif defined(__GNUC__) #include <stdint.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/ia32/efisetjmp_arch.h new/gnu-efi-3.0.11/inc/ia32/efisetjmp_arch.h --- old/gnu-efi-3.0.8/inc/ia32/efisetjmp_arch.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/ia32/efisetjmp_arch.h 2019-10-28 12:48:52.000000000 +0100 @@ -10,6 +10,6 @@ UINT32 Ebp; UINT32 Esp; UINT32 Eip; -} ALIGN(JMPBUF_ALIGN) jmp_buf; +} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; #endif /* GNU_EFI_IA32_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/ia64/efibind.h new/gnu-efi-3.0.11/inc/ia64/efibind.h --- old/gnu-efi-3.0.8/inc/ia64/efibind.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/ia64/efibind.h 2019-10-28 12:48:52.000000000 +0100 @@ -62,6 +62,8 @@ typedef unsigned char uint8_t; typedef char int8_t; #endif + typedef uint64_t uintptr_t; + typedef int64_t intptr_t; #elif defined(__GNUC__) #include <stdint.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/ia64/efisetjmp_arch.h new/gnu-efi-3.0.11/inc/ia64/efisetjmp_arch.h --- old/gnu-efi-3.0.8/inc/ia64/efisetjmp_arch.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/ia64/efisetjmp_arch.h 2019-10-28 12:48:52.000000000 +0100 @@ -42,6 +42,6 @@ UINT64 Predicates; UINT64 LoopCount; UINT64 FPSR; -} ALIGN(JMPBUF_ALIGN) jmp_buf; +} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; #endif /* GNU_EFI_IA64_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/mips64el/efibind.h new/gnu-efi-3.0.11/inc/mips64el/efibind.h --- old/gnu-efi-3.0.8/inc/mips64el/efibind.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/mips64el/efibind.h 2019-10-28 12:48:52.000000000 +0100 @@ -29,6 +29,8 @@ typedef short int16_t; typedef unsigned char uint8_t; typedef signed char int8_t; // unqualified 'char' is unsigned on ARM +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; #else #include <stdint.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/mips64el/efisetjmp_arch.h new/gnu-efi-3.0.11/inc/mips64el/efisetjmp_arch.h --- old/gnu-efi-3.0.8/inc/mips64el/efisetjmp_arch.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/mips64el/efisetjmp_arch.h 2019-10-28 12:48:52.000000000 +0100 @@ -29,6 +29,6 @@ UINT64 F30; UINT64 F31; #endif -} ALIGN(JMPBUF_ALIGN) jmp_buf; +} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; #endif /* GNU_EFI_MIPS64EL_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/x86_64/efibind.h new/gnu-efi-3.0.11/inc/x86_64/efibind.h --- old/gnu-efi-3.0.8/inc/x86_64/efibind.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/x86_64/efibind.h 2019-10-28 12:48:52.000000000 +0100 @@ -84,6 +84,8 @@ typedef unsigned char uint8_t; typedef char int8_t; #endif + typedef uint64_t uintptr_t; + typedef int64_t intptr_t; #elif defined(__GNUC__) #include <stdint.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/inc/x86_64/efisetjmp_arch.h new/gnu-efi-3.0.11/inc/x86_64/efisetjmp_arch.h --- old/gnu-efi-3.0.8/inc/x86_64/efisetjmp_arch.h 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/inc/x86_64/efisetjmp_arch.h 2019-10-28 12:48:52.000000000 +0100 @@ -17,6 +17,6 @@ UINT64 Rip; UINT64 MxCsr; UINT8 XmmBuffer[160]; // XMM6 - XMM15 -} ALIGN(JMPBUF_ALIGN) jmp_buf; +} ALIGN(JMPBUF_ALIGN) jmp_buf[1]; #endif /* GNU_EFI_X86_64_SETJMP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/lib/dpath.c new/gnu-efi-3.0.11/lib/dpath.c --- old/gnu-efi-3.0.8/lib/dpath.c 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/lib/dpath.c 2019-10-28 12:48:52.000000000 +0100 @@ -659,7 +659,8 @@ F1394_DEVICE_PATH *F1394; F1394 = DevPath; - CatPrint(Str, L"1394(%g)", &F1394->Guid); + // Guid has format of IEEE-EUI64 + CatPrint(Str, L"I1394(%016lx)", F1394->Guid); } @@ -863,9 +864,9 @@ INFINIBAND_DEVICE_PATH *InfiniBand; InfiniBand = DevPath; - CatPrint( Str , L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)" , - InfiniBand-> ResourceFlags , InfiniBand-> PortGid , InfiniBand-> ServiceId , - InfiniBand-> TargetPortId , InfiniBand-> DeviceId ) ; + CatPrint(Str, L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)", + InfiniBand->ResourceFlags, InfiniBand->PortGid, InfiniBand->ServiceId, + InfiniBand->TargetPortId, InfiniBand->DeviceId); } static VOID @@ -889,17 +890,19 @@ } if (Uart->BaudRate == 0) { - CatPrint(Str, L"Uart(DEFAULT %c",Uart->BaudRate,Parity); + CatPrint(Str, L"Uart(DEFAULT,"); } else { - CatPrint(Str, L"Uart(%d %c",Uart->BaudRate,Parity); + CatPrint(Str, L"Uart(%ld,", Uart->BaudRate); } if (Uart->DataBits == 0) { - CatPrint(Str, L"D"); + CatPrint(Str, L"DEFAULT,"); } else { - CatPrint(Str, L"%d",Uart->DataBits); + CatPrint(Str, L"%d,", Uart->DataBits); } + CatPrint(Str, L"%c,", Parity); + switch (Uart->StopBits) { case 0 : CatPrint(Str, L"D)"); break; case 1 : CatPrint(Str, L"1)"); break; @@ -933,21 +936,20 @@ Hd = DevPath; switch (Hd->SignatureType) { case SIGNATURE_TYPE_MBR: - CatPrint(Str, L"HD(Part%d,Sig%08X)", + CatPrint(Str, L"HD(%d,MBR,0x%08x)", Hd->PartitionNumber, *((UINT32 *)(&(Hd->Signature[0]))) ); break; case SIGNATURE_TYPE_GUID: - CatPrint(Str, L"HD(Part%d,Sig%g)", + CatPrint(Str, L"HD(%d,GPT,%g)", Hd->PartitionNumber, (EFI_GUID *) &(Hd->Signature[0]) ); break; default: - CatPrint(Str, L"HD(Part%d,MBRType=%02x,SigType=%02x)", + CatPrint(Str, L"HD(%d,%d,0)", Hd->PartitionNumber, - Hd->MBRType, Hd->SignatureType ); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/lib/error.c new/gnu-efi-3.0.11/lib/error.c --- old/gnu-efi-3.0.8/lib/error.c 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/lib/error.c 2019-10-28 12:48:52.000000000 +0100 @@ -56,7 +56,7 @@ { EFI_COMPROMISED_DATA, L"Compromised Data"}, // warnings - { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, + { EFI_WARN_UNKNOWN_GLYPH, L"Warning Unknown Glyph"}, { EFI_WARN_DELETE_FAILURE, L"Warning Delete Failure"}, { EFI_WARN_WRITE_FAILURE, L"Warning Write Failure"}, { EFI_WARN_BUFFER_TOO_SMALL, L"Warning Buffer Too Small"}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnu-efi-3.0.8/lib/runtime/rtstr.c new/gnu-efi-3.0.11/lib/runtime/rtstr.c --- old/gnu-efi-3.0.8/lib/runtime/rtstr.c 2018-03-14 19:54:51.000000000 +0100 +++ new/gnu-efi-3.0.11/lib/runtime/rtstr.c 2019-10-28 12:48:52.000000000 +0100 @@ -18,7 +18,7 @@ #include "lib.h" #ifndef __GNUC__ -#pragma RUNTIME_CODE(RtAcquireLock) +#pragma RUNTIME_CODE(RtStrCmp) #endif INTN RUNTIMEFUNCTION @@ -71,12 +71,12 @@ { UINTN Size = RtStrnLen(Src, Len); if (Size != Len) - RtSetMem(Dest + Len, '\0', (Len - Size) * sizeof(CHAR16)); + RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0'); RtCopyMem(Dest, Src, Size * sizeof(CHAR16)); } #ifndef __GNUC__ -#pragma RUNTIME_CODE(RtStrCpy) +#pragma RUNTIME_CODE(RtStpCpy) #endif CHAR16 * RUNTIMEFUNCTION @@ -94,7 +94,7 @@ } #ifndef __GNUC__ -#pragma RUNTIME_CODE(RtStrnCpy) +#pragma RUNTIME_CODE(RtStpnCpy) #endif CHAR16 * RUNTIMEFUNCTION @@ -107,7 +107,7 @@ { UINTN Size = RtStrnLen(Src, Len); if (Size != Len) - RtSetMem(Dest + Len, '\0', (Len - Size) * sizeof(CHAR16)); + RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0'); RtCopyMem(Dest, Src, Size * sizeof(CHAR16)); return Dest + Size; } @@ -122,11 +122,11 @@ IN CONST CHAR16 *Src ) { - RtStrCpy(Dest+StrLen(Dest), Src); + RtStrCpy(Dest+RtStrLen(Dest), Src); } #ifndef __GNUC__ -#pragma RUNTIME_CODE(RtStrCat) +#pragma RUNTIME_CODE(RtStrnCat) #endif VOID RUNTIMEFUNCTION @@ -136,7 +136,12 @@ IN UINTN Len ) { - RtStrnCpy(Dest+StrLen(Dest), Src, Len); + UINTN DestSize, Size; + + DestSize = RtStrLen(Dest); + Size = RtStrnLen(Src, Len); + RtCopyMem(Dest + DestSize, Src, Size * sizeof(CHAR16)); + Dest[DestSize + Size] = '\0'; } #ifndef __GNUC__ @@ -164,11 +169,11 @@ IN CONST CHAR16 *s1, IN UINTN Len ) -// copy strings +// string length { UINTN i; for (i = 0; *s1 && i < Len; i++) - s1++; + s1++; return i; }
