fixes for internationalization

[nagiosplug.git] / plugins / check_ssh.c

diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index ea74fa8865939a29c71b925b2993e20801650cbc..a21e2f524cbbbb33c63d39f4cd75e96034a9857a 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -14,17 +14,19 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+ $Id$
+ 
 ******************************************************************************/
 
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
 const char *progname = "check_ssh";
 const char *revision = "$Revision$";
-const char *copyright = "2000-2003";
+const char *copyright = "2000-2004";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
+#include "common.h"
+#include "netutils.h"
+#include "utils.h"
+
 #ifndef MSG_DONTWAIT
 #define MSG_DONTWAIT 0
 #endif
@@ -44,20 +46,23 @@ void print_usage (void);
 
 int ssh_connect (char *haddr, int hport, char *remote_version);
 
+
+
 int
 main (int argc, char **argv)
 {
-       int result;
+       int result = STATE_UNKNOWN;
 
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
-       if (process_arguments (argc, argv) == ERROR)
-               usage (_("Could not parse arguments\n"));
+       if (process_arguments (argc, argv) != TRUE)
+               usage4 (_("Could not parse arguments"));
 
        /* initialize alarm signal handling */
        signal (SIGALRM, socket_timeout_alarm_handler);
+       
        alarm (socket_timeout);
 
        /* ssh_connect exits if error is found */
@@ -69,6 +74,7 @@ main (int argc, char **argv)
 }
 
 
+
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -104,8 +110,9 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':                                                                       /* help */
-                       usage (_("Unknow argument\n"));
-                       break;
+                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
+                       print_usage ();
+                       exit (STATE_UNKNOWN);
                case 'V':                                                                       /* version */
                        print_revision (progname, revision);
                        exit (STATE_OK);
@@ -188,6 +195,7 @@ validate_arguments (void)
 *
 *-----------------------------------------------------------------------*/
 
+
 int
 ssh_connect (char *haddr, int hport, char *remote_version)
 {
@@ -240,6 +248,8 @@ ssh_connect (char *haddr, int hport, char *remote_version)
        }
 }
 
+
+
 void
 print_help (void)
 {
@@ -272,12 +282,14 @@ print_help (void)
        printf (_(UT_SUPPORT));
 }
 
+
+
 void
 print_usage (void)
 {
-       printf (_("\
+       printf ("\
 Usage: %s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n"), progname);
-       printf (_(UT_HLP_VRS), progname, progname);
+
+       printf (UT_HLP_VRS, progname, progname);
 }
 
-/* end of check_ssh.c */