Expand Type strings by one space, to fit ld.so, in the same ugly way "exe "
authorderaadt <deraadt@openbsd.org>
Sun, 4 Feb 2018 20:41:58 +0000 (20:41 +0000)
committerderaadt <deraadt@openbsd.org>
Sun, 4 Feb 2018 20:41:58 +0000 (20:41 +0000)
was being handled.

libexec/ld.so/dlfcn.c

index 8a6eab8..d6498bf 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dlfcn.c,v 1.100 2017/12/08 05:25:20 deraadt Exp $ */
+/*     $OpenBSD: dlfcn.c,v 1.101 2018/02/04 20:41:58 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -495,7 +495,7 @@ _dl_show_objects(void)
            "\t%x %e %t %O    %r   %g      %p\n";
 
        if (_dl_tracefmt1 == NULL && _dl_tracefmt2 == NULL)
-               _dl_dprintf(outputfd, "\tStart   %s End     %s Type Open Ref GrpRef Name\n",
+               _dl_dprintf(outputfd, "\tStart   %s End     %s Type  Open Ref GrpRef Name\n",
                    pad, pad);
 
        if (_dl_tracelib) {
@@ -512,16 +512,16 @@ _dl_show_objects(void)
                        objtypename = "ld.so";
                        break;
                case OBJTYPE_EXE:
-                       objtypename = "exe ";
+                       objtypename = "exe  ";
                        break;
                case OBJTYPE_LIB:
-                       objtypename = "rlib";
+                       objtypename = "rlib ";
                        break;
                case OBJTYPE_DLO:
-                       objtypename = "dlib";
+                       objtypename = "dlib ";
                        break;
                default:
-                       objtypename = "????";
+                       objtypename = "?????";
                        break;
                }
                _dl_tracefmt(outputfd, object, fmt1, fmt2, objtypename);