From 2448c967f6fed9cc8f570ec2df3f1d59b714e33e Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Sun, 6 Sep 2009 13:27:28 +0200 Subject: Dropping -f/-u arguments as suggested by Kai Hendry --- surf.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'surf.c') diff --git a/surf.c b/surf.c index 192e26a..2a6d388 100644 --- a/surf.c +++ b/surf.c @@ -524,7 +524,7 @@ titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) { void usage() { fputs("surf - simple browser\n", stderr); - die("usage: surf [-e] [-x] [-u uri] [-f file]\n"); + die("usage: surf [-e] [-x] [uri]\n"); } void @@ -564,21 +564,21 @@ int main(int argc, char *argv[]) { showxid = TRUE; embed = TRUE; break; - case 'u': - c = newclient(); - loaduri(c, optarg); - break; - case 'f': - c = newclient(); - loadfile(c, optarg); - break; case 'v': die("surf-"VERSION", © 2009 surf engineers, see LICENSE for details\n"); break; default: usage(); } - if(optind != argc) + if(optind + 1 == argc) { + c = newclient(); + if(strchr("./", argv[optind][0]) || strcmp("-", argv[optind]) == 0) + loadfile(c, argv[optind]); + else + loaduri(c, argv[optind]); + + } + else if(optind != argc) usage(); if(!clients) newclient(); -- cgit v1.2.3