From: Colin Walters Date: Wed, 2 Aug 2023 15:34:14 +0000 (-0400) Subject: More fully drop `trivial-httpd` entrypoint X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~29^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60b4655677b39bf4a69da9f395f787ed5a95fe3c;p=ostree.git 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 b5054c92..9f52cf78 100644 --- a/man/index.xml +++ b/man/index.xml @@ -196,10 +196,6 @@ License along with this library. If not, see . ostree-prepare-root1 - - ostree-trivial-httpd1 - - rofiles-fuse1 diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml deleted file mode 100644 index 7ba1dae8..00000000 --- a/man/ostree-trivial-httpd.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - ostree trivial-httpd - OSTree - - - - Developer - Colin - Walters - walters@verbum.org - - - - - - ostree trivial-httpd - 1 - - - - ostree-trivial-httpd - Simple webserver - - - - - ostree trivial-httpd OPTIONS DIR - - - - - - Description - - - This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory. - - - - - Options - - - - , - - - Fork into background when ready. - - - - - - - - Automatically exit when directory is deleted. - - - - - ,="PATH" - - - Write port number to PATH (- for standard output). - - - - - , - - - Use the specified TCP port to listen on. - - - - - - - - Force range requests by only serving half of files. - - - - - - - - Example - $ ostree trivial-httpd - - diff --git a/man/ostree.xml b/man/ostree.xml index 39f78845..779024b6 100644 --- a/man/ostree.xml +++ b/man/ostree.xml @@ -426,14 +426,6 @@ License along with this library. If not, see . Regenerate the repository summary metadata. - - - ostree-trivial-httpd1 - - - Simple webserver. - - diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c deleted file mode 100644 index b5e84007..00000000 --- a/src/ostree/ot-builtin-trivial-httpd.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2016 Colin Walters - * - * 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 . - */ - -#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 4d15b7a2..e14f67ff 100644 --- 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