lib/Odin.pm, bin/pastebin.userv: Use our own simple option parser.

[odin-cgi] / bin / pastebin.userv

diff --git a/bin/pastebin.userv b/bin/pastebin.userv
index 4d5d4c01807f46d38f844e3cd2b63a8bf495ff48..3c87cb56cebff2dbc8d2fe3df26ee90db425ba08 100755 (executable)
--- a/bin/pastebin.userv
+++ b/bin/pastebin.userv
@@ -6,7 +6,6 @@ use Odin;
 use DBI;
 use Encode;
 use Encode::Locale;
 use DBI;
 use Encode;
 use Encode::Locale;

-use Getopt::Std;

 use POSIX;
 
 my $BAD = 0;
 use POSIX;
 
 my $BAD = 0;


@@ -53,11 +52,17 @@ EOF
       $t, $tag, $lang, encode locale => $title;
   }
 } elsif ($op eq "new") {
       $t, $tag, $lang, encode locale => $title;
   }
 } elsif ($op eq "new") {

-  my %o;
-  getopts "l:t:", \%o and @ARGV == 0
-    or Odin::fail "usage: new [-l LANG] [-t TITLE]";
-  my %p = (title => decode(locale => $o{t}), lang => $o{l} // "txt",
-          content => read_content);
+  my $op = Odin::OptParse->new(@ARGV);
+  my $p = (title => undef, lang => "txt");
+  while (my $o = $op->get) {
+    if ($o eq "l") { $p{lang} = $op->arg; }
+    elsif ($o eq "t") { $p{title} = decode locale => $op->arg; }
+    else { $op->unk; }
+  }
+  @ARGV = $op->rest;
+  $op->bad if @ARGV;
+  $op->ok or Odin::fail "usage: new [-l LANG] [-t TITLE]";
+  $p{content} = read_content;

   my $db = Odin::open_db;
   my $c = "";
   while (read STDIN, my $buf, 8192) { $c .= $buf; }
   my $db = Odin::open_db;
   my $c = "";
   while (read STDIN, my $buf, 8192) { $c .= $buf; }


@@ -85,12 +90,19 @@ EOF
   @ARGV or Odin::fail "usage: del TAG ...";
   Odin::delete_pastebin map { $_, undef } @ARGV;
 } elsif ($op eq "update") {
   @ARGV or Odin::fail "usage: del TAG ...";
   Odin::delete_pastebin map { $_, undef } @ARGV;
 } elsif ($op eq "update") {

-  my %o;
-  getopts "cl:t:", \%o and @ARGV == 1
-    or Odin::fail "usage: update [-c] [-l LANG] [-t TITLE] TAG";
-  my ($tag) = @ARGV;
-  my %p = (title => decode(locale => $o{t}), lang => $o{l});
-  if ($o{c}) { $p{content} = read_content; }
+  my $op = Odin::OptParse->new(@ARGV);
+  my %p = ();
+  my $contentp = 0;
+  while (my $o = $op->get) {
+    if ($o eq "c") { $contentp = 1; }
+    elsif ($o eq "l") { $p{lang} = $op->arg; }
+    elsif ($o eq "t") { $p{title} = decode locale => $op->arg; }
+    else { $op->unk; }
+  }
+  @ARGV = $op->rest;
+  $op->bad if @ARGV;
+  $op->ok or Odin::fail "usage: new [-l LANG] [-t TITLE]";
+  $p{content} = read_content if $contentp;

   Odin::update_pastebin $tag, undef, %p or Odin::fail "nothing changed";
 } else {
   Odin::fail "unknown operation `$op'";
   Odin::update_pastebin $tag, undef, %p or Odin::fail "nothing changed";
 } else {
   Odin::fail "unknown operation `$op'";