Rename camliup to camput; move.

clients/go/camput/.gitignore

@@ -1,4 +1,5 @@
 *.8
 *.6
-camliup
+camput
+
 

clients/go/camput/Makefile

@@ -1,8 +1,8 @@
 include $(GOROOT)/src/Make.inc
 
-TARG=camliup
+TARG=camput
 GOFILES=\
-	camliup.go\
+	camput.go\
 
 include $(GOROOT)/src/Make.cmd
 

clients/go/camput/camput.go

@@ -16,10 +16,15 @@ import (
 	"strings"
 )
 
-var flagFile *string = flag.String("file", "", "file to upload")
-var flagServer *string = flag.String("server", "http://localhost:3179/", "camlistore blob server")
+// These override the JSON config file ~/.camlistore's "server" and
+// "password" keys
+var flagServer *string = flag.String("server", "", "camlistore blob server")
 var flagPassword *string = flag.String("password", "", "password for blob server")
 
+// Things that can be uploaded.  (at most one of these)
+var flagBlob *string = flag.String("blob", "", "upload a file's bytes as a single blob")
+var flagFile *string = flag.String("file", "", "upload a file's bytes as a blob, as well as its JSON file record")
+
 type UploadHandle struct {
 	blobref  string
 	contents io.ReadSeeker