Merge pull request #92 from marshmellow42/master

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index b8d5c316cf9bce03cfd4faab842d4ad1e0185423..709e2014911205631f689f1970f19594573d1930 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -121,19 +121,24 @@ char * sprint_hex(const uint8_t * data, const size_t len) {
        return buf;
 }
 
-char * sprint_bin(const uint8_t * data, const size_t len) {
+char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
        
        int maxLen = ( len > 1024) ? 1024 : len;
        static char buf[1024];
-       char * tmp = buf;
-       size_t i;
+       char *tmp = buf;
 
-       for (i=0; i < maxLen; ++i, ++tmp)
-               sprintf(tmp, "%u", data[i]);
+       for (size_t i=0; i < maxLen; ++i){
+               sprintf(tmp++, "%u", data[i]);
+               if (breaks > 0 && !((i+1) % breaks))
+                       sprintf(tmp++, "%s","\n");
+       }
 
        return buf;
 }
 
+char *sprint_bin(const uint8_t *data, const size_t len) {
+       return sprint_bin_break(data, len, 0);
+}
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
        while (len--) {
@@ -213,6 +218,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
+
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
@@ -227,6 +233,35 @@ uint8_t param_get8(const char *line, int paramnum)
        return param_get8ex(line, paramnum, 10, 0);
 }
 
+/**
+ * @brief Reads a decimal integer (actually, 0-254, not 255)
+ * @param line
+ * @param paramnum
+ * @return -1 if error
+ */
+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
+{
+       uint8_t val =  param_get8ex(line, paramnum, 255, 10);
+       if( (int8_t) val == -1) return 1;
+       (*destination) = val;
+       return 0;
+}
+/**
+ * @brief Checks if param is decimal
+ * @param line
+ * @param paramnum
+ * @return
+ */
+uint8_t param_isdec(const char *line, int paramnum)
+{
+       int bg, en;
+       //TODO, check more thorougly
+       if (!param_getptr(line, &bg, &en, paramnum)) return 1;
+               //              return strtoul(&line[bg], NULL, 10) & 0xff;
+
+       return 0;
+}
+
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;