From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 6 Oct 2017 18:05:15 +0000 (+0100)
Subject: Revert "fishdescriptor: Utility for RTLD_NOW"
X-Git-Tag: archive/debian/6.0.0~1^2~37
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=38b9a663b6ca063bf79460c5e7abd1c3c476accb

Revert "fishdescriptor: Utility for RTLD_NOW"

This reverts commit 22677ae542431ce09a8de83fecc3a22163a8d490.
---

diff --git a/fishdescriptor/Makefile b/fishdescriptor/Makefile
index 5b63931..e6b493a 100644
--- a/fishdescriptor/Makefile
+++ b/fishdescriptor/Makefile
@@ -9,7 +9,7 @@ MINOR=0
 LIBCANON=       libfishdescriptor-donate.so.$(MAJOR)
 LIBTARGET=      $(LIBCANON).$(MINOR)
 
-all:	$(LIBTARGET) fishdescriptor
+all:	$(LIBTARGET)
 
 $(LIBTARGET):	donate.o
 	$(CC) -shared -Wl,-soname -Wl,$(LIBCANON) -o $@ $< $(LIBS)
diff --git a/fishdescriptor/fishdescriptor.c b/fishdescriptor/fishdescriptor.c
deleted file mode 100644
index b86831f..0000000
--- a/fishdescriptor/fishdescriptor.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- * utility
- *
- */
-
-#define _GNU_SOURCE
-
-#include <unistd.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-
-static const struct option longopts[] = {
-  { "print-rtld-now", 0, 0, '\1' },
-  { }
-};
-
-static void printusage(FILE *f) {
-  fputs("usage: fishdescriptor --print-rtld-now\n",f);
-}
-
-int main(int argc, char **argv) {
-  int o;
-
-  while ((o = getopt_long(argc, argv, "", longopts, 0)) != -1) {
-    switch (o) {
-    case '\1' /* --print-rtld-now */:
-      printf("%d\n", RTLD_NOW);
-      exit (0);
-    default:
-      fputs("bad usage: unknown option\n",stderr);
-      printusage(stderr);
-      exit(-1);
-    }
-  }
-
-  fputs("bad usage: XXX\n",stderr);
-  printusage(stderr);
-  exit(-1);
-}