[brlcad-commits] SF.net SVN: brlcad:[34417] brlcad/trunk/src/libged/concat.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <bo...@us...> - 2009-05-05 16:21:25
|
Revision: 34417 http://brlcad.svn.sourceforge.net/brlcad/?rev=34417&view=rev Author: bob1961 Date: 2009-05-05 16:21:08 +0000 (Tue, 05 May 2009) Log Message: ----------- Modified ged_concat to not require a suffix/prefix. If one is not provided, it behaves as if / was specified. Modified Paths: -------------- brlcad/trunk/src/libged/concat.c Modified: brlcad/trunk/src/libged/concat.c =================================================================== --- brlcad/trunk/src/libged/concat.c 2009-05-05 07:07:43 UTC (rev 34416) +++ brlcad/trunk/src/libged/concat.c 2009-05-05 16:21:08 UTC (rev 34417) @@ -88,9 +88,10 @@ return BRLCAD_HELP; } - if ( (argc < 3) || - (argc > 4) || - (argc > 1 && argv[1][0] == '-' && argc != 4) ) { + if ((argc < 2) || + (argc > 4) || + (argv[1][0] != '-' && argc > 3) || + (argv[1][0] == '-' && (argc < 3 || argc > 4))) { bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); return BRLCAD_ERROR; } @@ -107,7 +108,7 @@ cc_data.copy_mode |= AUTO_PREFIX; - if (strcmp(argv[3], "/") == 0) { + if (argc == 3 || strcmp(argv[3], "/") == 0) { cc_data.copy_mode = NO_AFFIX | CUSTOM_PREFIX; } else { (void)bu_vls_strcpy(&cc_data.affix, argv[3]); @@ -118,7 +119,7 @@ cc_data.copy_mode |= AUTO_SUFFIX; - if (strcmp(argv[3], "/") == 0) { + if (argc == 3 || strcmp(argv[3], "/") == 0) { cc_data.copy_mode = NO_AFFIX | CUSTOM_SUFFIX; } else { (void)bu_vls_strcpy(&cc_data.affix, argv[3]); @@ -138,7 +139,7 @@ cc_data.copy_mode |= AUTO_PREFIX; - if (strcmp(argv[2], "/") == 0) { + if (argc == 2 || strcmp(argv[2], "/") == 0) { cc_data.copy_mode = NO_AFFIX | CUSTOM_PREFIX; } else { (void)bu_vls_strcpy(&cc_data.affix, argv[2]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |