Index: /trunk/Nebulous/bin/neb-xattr
===================================================================
--- /trunk/Nebulous/bin/neb-xattr	(revision 17813)
+++ /trunk/Nebulous/bin/neb-xattr	(revision 17814)
@@ -3,5 +3,5 @@
 # Copyright (C) 2008  Joshua Hoblitt
 #
-# $Id: neb-xattr,v 1.6 2008-05-22 19:56:02 jhoblitt Exp $
+# $Id: neb-xattr,v 1.7 2008-05-27 21:03:50 jhoblitt Exp $
 
 use strict;
@@ -40,5 +40,5 @@
 );
 
-die "can't connected to Nebulous Server: $server"
+die "can't connect to Nebulous Server: $server"
     unless defined $neb;
 
@@ -46,5 +46,5 @@
 if (defined $delete) {
     die "--delete requires a list of xattr names" unless scalar @ARGV;
-    delete_xattrs($key, @ARGV);
+    delete_xattrs($neb, $key, @ARGV) or die;
     exit(0);
 }
@@ -53,5 +53,5 @@
 if (defined $write) {
     die "--write requires a list of xattr:value pairs" unless scalar @ARGV;
-    write_xattrs($key, @ARGV);
+    write_xattrs($neb, $key, @ARGV) or die;
     exit(0);
 }
@@ -59,21 +59,22 @@
 # key without xattr name list means print all xattr:value pairs
 if (not scalar @ARGV) {
-    print_all_xattrs($key);
+    print_all_xattrs($neb, $key) or die;
     exit(0);
 }
 
 # key with xattr name list means print the xattr:value pairs
-print_xattrs($key, @ARGV);
+print_xattrs($neb, $key, @ARGV) or die;
 exit(0);
 
 sub print_all_xattrs
 {
-    my $key = shift;
-
+    my ($neb, $key) = @_;
+
+    return unless defined $neb;
     return unless defined $key;
 
     my $xattr_names = $neb->listxattr($key) or die $neb->err;
     foreach my $name (@$xattr_names) {
-        print_xattrs($key, $name);
+        print_xattrs($neb, $key, $name) or return;
     }
 
@@ -84,6 +85,7 @@
 sub print_xattrs
 {
-    my ($key, @xattr_names) = @_;
-
+    my ($neb, $key, @xattr_names) = @_;
+
+    return unless defined $neb;
     return unless defined $key;
     return unless scalar @xattr_names;
@@ -103,6 +105,7 @@
 sub write_xattrs
 {
-    my ($key, @xattr_pairs) = @_;
-
+    my ($neb, $key, @xattr_pairs) = @_;
+
+    return unless defined $neb;
     return unless defined $key;
     return unless scalar @xattr_pairs;
@@ -124,6 +127,7 @@
 sub delete_xattrs
 {
-    my ($key, @xattr_names) = @_;
-
+    my ($neb, $key, @xattr_names) = @_;
+
+    return unless defined $neb;
     return unless defined $key;
     return unless scalar @xattr_names;