瀏覽代碼

fix separator in r.category

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54813 15284696-431f-4ddb-bdfa-cd5b030d7da7
Luca Delucchi 12 年之前
父節點
當前提交
b3101da5cf
共有 1 個文件被更改,包括 12 次插入10 次删除
  1. 12 10
      raster/r.category/main.c

+ 12 - 10
raster/r.category/main.c

@@ -109,16 +109,18 @@ int main(int argc, char *argv[])
     name = parm.map->answer;
 
     /* see v.in.ascii for a better solution */
-    if (parm.fs->answer != NULL) {
-	if (strcmp(parm.fs->answer, "space") == 0)
-	    fs = ' ';
-	else if (strcmp(parm.fs->answer, "tab") == 0)
-	    fs = '\t';
-	else if (strcmp(parm.fs->answer, "\\t") == 0)
-	    fs = '\t';
-	else
-	    fs = parm.fs->answer[0];
-    }
+    if (strcmp(parm.fs->answer, "space") == 0)
+	fs = ' ';
+    else if (strcmp(parm.fs->answer, "\\t") == 0)
+	fs = '\t';
+    else if (strcmp(parm.fs->answer, "newline") == 0)
+	fs = '\n';
+    else if (strcmp(parm.fs->answer, "comma") == 0)
+	fs = ',';
+    else if (strcmp(parm.fs->answer, "tab") == 0)
+	fs = '\t';
+    else
+	fs = parm.fs->answer[0];
 
     mapset = G_find_raster2(name, "");
     if (mapset == NULL)