More fully drop `trivial-httpd` entrypoint

It's just part of the tests and we should no longer
support `ostree trivial-httpd`.

This is a followup cleanup to previous work.

diff --git a/man/index.xml b/man/index.xml
index b5054c92da44cbd52c320e21833f7ac18df06c36..9f52cf78b79c93db15fd4c74d617aa7316d681ed 100644 (file)
--- a/man/index.xml
+++ b/man/index.xml
@@ -196,10 +196,6 @@ License along with this library. If not, see <https://www.gnu.org/licenses/>.
         <refentrytitle>ostree-prepare-root</refentrytitle><manvolnum>1</manvolnum>
     </citerefentry></primaryie></indexentry>
 
-    <indexentry><primaryie><citerefentry>
-        <refentrytitle>ostree-trivial-httpd</refentrytitle><manvolnum>1</manvolnum>
-    </citerefentry></primaryie></indexentry>
-
     <indexentry><primaryie><citerefentry>
         <refentrytitle>rofiles-fuse</refentrytitle><manvolnum>1</manvolnum>
     </citerefentry></primaryie></indexentry>

diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml
deleted file mode 100644 (file)
index 7ba1dae..0000000
--- a/man/ostree-trivial-httpd.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-Copyright 2011,2013 Colin Walters <walters@verbum.org>
-
-SPDX-License-Identifier: LGPL-2.0+
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library. If not, see <https://www.gnu.org/licenses/>.
--->
-
-<refentry id="ostree">
-
-    <refentryinfo>
-        <title>ostree trivial-httpd</title>
-        <productname>OSTree</productname>
-
-        <authorgroup>
-            <author>
-                <contrib>Developer</contrib>
-                <firstname>Colin</firstname>
-                <surname>Walters</surname>
-                <email>walters@verbum.org</email>
-            </author>
-        </authorgroup>
-    </refentryinfo>
-
-    <refmeta>
-        <refentrytitle>ostree trivial-httpd</refentrytitle>
-        <manvolnum>1</manvolnum>
-    </refmeta>
-
-    <refnamediv>
-        <refname>ostree-trivial-httpd</refname>
-        <refpurpose>Simple webserver</refpurpose>
-    </refnamediv>
-
-    <refsynopsisdiv>
-            <cmdsynopsis>
-                <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
-            </cmdsynopsis>
-    </refsynopsisdiv>
-
-<!-- Don't entirely understand this command.  Needs details, better content-->
-    <refsect1>
-        <title>Description</title>
-
-        <para>
-            This runs a simple webserver and keeps it running until killed.  If DIR is not specified, it defaults to the current directory.
-        </para>
-    </refsect1>
-
-    <refsect1>
-        <title>Options</title>
-
-        <variablelist>
-            <varlistentry>
-                <term><option>--daemonize</option>,<option>-d</option></term>
-
-                <listitem><para>
-                    Fork into background when ready.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--autoexit</option></term>
-
-                <listitem><para>
-                    Automatically exit when directory is deleted.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
-
-                <listitem><para>
-                    Write port number to PATH (- for standard output).
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--port</option>,<option>-P</option></term>
-
-                <listitem><para>
-                    Use the specified TCP port to listen on.
-                </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-                <term><option>--force-range-requests</option></term>
-
-                <listitem><para>
-                    Force range requests by only serving half of files.
-                </para></listitem>
-            </varlistentry>
-        </variablelist>
-    </refsect1>
-
-<!-- NEED EXAMPLE OUTPUT HERE!-->
-    <refsect1>
-        <title>Example</title>
-        <para><command>$ ostree trivial-httpd</command></para>
-    </refsect1>
-</refentry>

diff --git a/man/ostree.xml b/man/ostree.xml
index 39f78845c53bb1153a344ac7c169561f8b76350d..779024b6fb56ee449e381e13595323a9b51d4e8d 100644 (file)
--- a/man/ostree.xml
+++ b/man/ostree.xml
@@ -426,14 +426,6 @@ License along with this library. If not, see <https://www.gnu.org/licenses/>.
                     Regenerate the repository summary metadata.
                 </para></listitem>
             </varlistentry>
-
-            <varlistentry>
-                <term><citerefentry><refentrytitle>ostree-trivial-httpd</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
-                
-                <listitem><para>
-                    Simple webserver.
-                </para></listitem>
-            </varlistentry>
         </variablelist>
     </refsect1>
 

diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
deleted file mode 100644 (file)
index b5e8400..0000000
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2016 Colin Walters <walters@verbum.org>
- *
- * SPDX-License-Identifier: LGPL-2.0+
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "ostree.h"
-#include "ot-builtins.h"
-#include "ot-main.h"
-#include "otutil.h"
-
-gboolean
-ostree_builtin_trivial_httpd (int argc, char **argv, OstreeCommandInvocation *invocation,
-                              GCancellable *cancellable, GError **error)
-{
-  g_autoptr (GPtrArray) new_argv = g_ptr_array_new ();
-
-  g_ptr_array_add (new_argv, PKGLIBEXECDIR "/ostree-trivial-httpd");
-  for (int i = 1; i < argc; i++)
-    g_ptr_array_add (new_argv, argv[i]);
-  g_ptr_array_add (new_argv, NULL);
-  execvp (new_argv->pdata[0], (char **)new_argv->pdata);
-  /* Fall through on error */
-  glnx_set_error_from_errno (error);
-  return FALSE;
-}

diff --git a/src/ostree/ot-builtins.h b/src/ostree/ot-builtins.h
index 4d15b7a2cf883d03ecebf5d32f1fabe009de2e3a..e14f67ff291ff0622b21d4bd6fff7cd0af99b4e6 100644 (file)
--- a/src/ostree/ot-builtins.h
+++ b/src/ostree/ot-builtins.h
@@ -61,7 +61,6 @@ BUILTINPROTO (summary);
 BUILTINPROTO (rev_parse);
 BUILTINPROTO (remote);
 BUILTINPROTO (write_refs);
-BUILTINPROTO (trivial_httpd);
 
 #undef BUILTINPROTO