Changeset 858fc90 in mainline for uspace/srv/net/app/parse.c

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from bzr://bzr.helenos.org/head.

File:

• uspace/srv/net/app/parse.c (modified) (3 diffs)

uspace/srv/net/app/parse.c

@@ -38 +38 @@
 #include <string.h>
 
+#include "../include/socket.h"
+
 #include "../err.h"
 
 #include "parse.h"
 
-int parse_parameter_int( int argc, char ** argv, int * index, int * value, const char * name, int offset ){
-        char *  rest;
+int parse_address_family(const char * name){
+        if(str_lcmp(name, "AF_INET", 7) == 0){
+                return AF_INET;
+        }else if(str_lcmp(name, "AF_INET6", 8) == 0){
+                return AF_INET6;
+        }
+        return EAFNOSUPPORT;
+}
 
-        if( offset ){
-                * value = strtol( argv[ * index ] + offset, & rest, 10 );
-        }else if(( * index ) + 1 < argc ){
-                ++ ( * index );
-                * value = strtol( argv[ * index ], & rest, 10 );
+int parse_parameter_int(int argc, char ** argv, int * index, int * value, const char * name, int offset){
+        char * rest;
+
+        if(offset){
+                *value = strtol(argv[*index] + offset, &rest, 10);
+        }else if((*index) + 1 < argc){
+                ++ (*index);
+                *value = strtol(argv[*index], &rest, 10);
         }else{
-                fprintf( stderr, "Command line error: missing %s\n", name );
+                fprintf(stderr, "Command line error: missing %s\n", name);
                 return EINVAL;
         }
-        if( rest && ( * rest )){
-                fprintf( stderr, "Command line error: %s unrecognized (%d: %s)\n", name, * index, argv[ * index ] );
+        if(rest && (*rest)){
+                fprintf(stderr, "Command line error: %s unrecognized (%d: %s)\n", name, * index, argv[*index]);
                 return EINVAL;
         }
@@ -61 +72 @@
 }
 
-int parse_parameter_string( int argc, char ** argv, int * index, char ** value, const char * name, int offset ){
-        if( offset ){
-                * value = argv[ * index ] + offset;
-        }else if(( * index ) + 1 < argc ){
-                ++ ( * index );
-                * value = argv[ * index ];
+int parse_parameter_name_int(int argc, char ** argv, int * index, int * value, const char * name, int offset, int (*parse_value)(const char * value)){
+        ERROR_DECLARE;
+
+        char * parameter;
+
+        ERROR_PROPAGATE(parse_parameter_string(argc, argv, index, &parameter, name, offset));
+        *value = (*parse_value)(parameter);
+        if((*value) == ENOENT){
+                fprintf(stderr, "Command line error: unrecognized %s value (%d: %s)\n", name, * index, parameter);
+                return ENOENT;
+        }
+        return EOK;
+}
+
+int parse_parameter_string(int argc, char ** argv, int * index, char ** value, const char * name, int offset){
+        if(offset){
+                *value = argv[*index] + offset;
+        }else if((*index) + 1 < argc){
+                ++ (*index);
+                *value = argv[*index];
         }else{
-                fprintf( stderr, "Command line error: missing %s\n", name );
+                fprintf(stderr, "Command line error: missing %s\n", name);
                 return EINVAL;
         }
@@ -74 +99 @@
 }
 
-int parse_parameter_name_int( int argc, char ** argv, int * index, int * value, const char * name, int offset, int ( * parse_value )( const char * value )){
-        ERROR_DECLARE;
-
-        char *  parameter;
-
-        ERROR_PROPAGATE( parse_parameter_string( argc, argv, index, & parameter, name, offset ));
-        * value = ( * parse_value )( parameter );
-        if(( * value ) == ENOENT ){
-                fprintf( stderr, "Command line error: unrecognized %s value (%d: %s)\n", name, * index, parameter );
-                return ENOENT;
+int parse_protocol_family(const char * name){
+        if(str_lcmp(name, "PF_INET", 7) == 0){
+                return PF_INET;
+        }else if(str_lcmp(name, "PF_INET6", 8) == 0){
+                return PF_INET6;
         }
-        return EOK;
+        return EPFNOSUPPORT;
 }
 
-void print_unrecognized( int index, const char * parameter ){
-        fprintf( stderr, "Command line error - unrecognized parameter (%d: %s)\n", index, parameter );
+int parse_socket_type(const char * name){
+        if(str_lcmp(name, "SOCK_DGRAM", 11) == 0){
+                return SOCK_DGRAM;
+        }else if(str_lcmp(name, "SOCK_STREAM", 12) == 0){
+                return SOCK_STREAM;
+        }
+        return ESOCKTNOSUPPORT;
+}
+
+void print_unrecognized(int index, const char * parameter){
+        fprintf(stderr, "Command line error: unrecognized argument (%d: %s)\n", index, parameter);
 }