[mapserver-commits] r11397 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Wed Mar 30 16:09:01 EDT 2011
Author: sdlime
Date: 2011-03-30 13:09:01 -0700 (Wed, 30 Mar 2011)
New Revision: 11397
Modified:
trunk/mapserver/HISTORY.TXT
trunk/mapserver/scalebar.c
trunk/mapserver/shp2img.c
trunk/mapserver/sortshp.c
trunk/mapserver/sym2img.c
Log:
Make sure command-line programs use an exit status other than 0 when an error is encountered.
Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT 2011-03-30 19:57:35 UTC (rev 11396)
+++ trunk/mapserver/HISTORY.TXT 2011-03-30 20:09:01 UTC (rev 11397)
@@ -15,6 +15,9 @@
Current Version (SVN trunk):
----------------------------
+- Make sure command-line programs use an exit status other than 0
+ when an error is encountered. (#3753)
+
- Applied patch to filter unwanted fribidi characters (#3763)
- Fixed lexer to set the proper state on URL variable substitutions
Modified: trunk/mapserver/scalebar.c
===================================================================
--- trunk/mapserver/scalebar.c 2011-03-30 19:57:35 UTC (rev 11396)
+++ trunk/mapserver/scalebar.c 2011-03-30 20:09:01 UTC (rev 11397)
@@ -43,21 +43,21 @@
/* ---- check the number of arguments, return syntax if not correct ---- */
if( argc < 3 ) {
- fprintf(stdout,"Syntax: scalebar [mapfile] [output image]\n" );
- exit(0);
+ fprintf(stdout,"Syntax: scalebar [mapfile] [output image]\n" );
+ exit(1);
}
map = msLoadMap(argv[1], NULL);
if(!map) {
msWriteError(stderr);
- exit(0);
+ exit(1);
}
image = msDrawScalebar(map);
if(!image) {
msWriteError(stderr);
- exit(0);
+ exit(1);
}
msSaveImage(map, image, argv[2]);
Modified: trunk/mapserver/shp2img.c
===================================================================
--- trunk/mapserver/shp2img.c 2011-03-30 19:57:35 UTC (rev 11396)
+++ trunk/mapserver/shp2img.c 2011-03-30 20:09:01 UTC (rev 11397)
@@ -120,7 +120,7 @@
{
msWriteError(stderr);
msCleanup();
- exit(0);
+ exit(1);
}
for(i=1;i<argc;i++) { /* Step though the user arguments, 1st to find map file */
@@ -130,7 +130,7 @@
if(!map) {
msWriteError(stderr);
msCleanup();
- exit(0);
+ exit(1);
}
msApplyDefaultSubstitutions(map);
}
@@ -139,7 +139,7 @@
if(!map) {
fprintf(stderr, "Mapfile (-m) option not specified.\n");
msCleanup();
- exit(0);
+ exit(1);
}
@@ -243,7 +243,7 @@
fprintf( stderr,
"Argument -e needs 4 space separated numbers as argument.\n" );
msCleanup();
- exit(0);
+ exit(1);
}
map->extent.minx = atof(argv[i+1]);
map->extent.miny = atof(argv[i+2]);
@@ -271,7 +271,7 @@
if (layer_found==0) {
fprintf(stderr, "Layer (-l) \"%s\" not found\n", layers[j]);
msCleanup();
- exit(0);
+ exit(1);
}
}
@@ -302,7 +302,7 @@
msFreeMap(map);
msCleanup();
- exit(0);
+ exit(1);
}
if( msSaveImage(map, image, outfile) != MS_SUCCESS ) {
Modified: trunk/mapserver/sortshp.c
===================================================================
--- trunk/mapserver/sortshp.c 2011-03-30 19:57:35 UTC (rev 11396)
+++ trunk/mapserver/sortshp.c 2011-03-30 20:09:01 UTC (rev 11397)
@@ -101,7 +101,7 @@
/* ------------------------------------------------------------------------------- */
if( argc != 5 ) {
fprintf(stderr,"Syntax: sortshp [infile] [outfile] [item] [ascending|descending]\n" );
- exit(0);
+ exit(1);
}
msSetErrorFile("stderr", NULL);
@@ -112,7 +112,7 @@
inSHP = msSHPOpen(argv[1], "rb" );
if( !inSHP ) {
fprintf(stderr,"Unable to open %s shapefile.\n",argv[1]);
- exit(0);
+ exit(1);
}
msSHPGetInfo(inSHP, &nShapes, &shpType);
@@ -123,7 +123,7 @@
inDBF = msDBFOpen(buffer,"rb");
if( inDBF == NULL ) {
fprintf(stderr,"Unable to open %s XBASE file.\n",buffer);
- exit(0);
+ exit(1);
}
num_fields = msDBFGetFieldCount(inDBF);
@@ -139,13 +139,13 @@
if(fieldNumber < 0) {
fprintf(stderr,"Item %s doesn't exist in %s\n",argv[3],buffer);
- exit(0);
+ exit(1);
}
array = (sortStruct *)malloc(sizeof(sortStruct)*num_records); /* ---- Allocate the array ---- */
if(!array) {
fprintf(stderr, "Unable to allocate sort array.\n");
- exit(0);
+ exit(1);
}
/* ------------------------------------------------------------------------------- */
@@ -179,7 +179,7 @@
break;
default:
fprintf(stderr,"Data type for item %s not supported.\n",argv[3]);
- exit(0);
+ exit(1);
}
/* ------------------------------------------------------------------------------- */
Modified: trunk/mapserver/sym2img.c
===================================================================
--- trunk/mapserver/sym2img.c 2011-03-30 19:57:35 UTC (rev 11396)
+++ trunk/mapserver/sym2img.c 2011-03-30 20:09:01 UTC (rev 11397)
@@ -73,7 +73,7 @@
*/
if(msLoadSymbolSet(&symbolSet) == -1) {
msWriteError(stderr);
- exit(0);
+ exit(1);
}
ns = symbolSet.numsymbols;
@@ -162,7 +162,7 @@
if((stream = fopen(argv[2],"wb")) == NULL) { /* open the file */
fprintf(stderr, "Unable to open output file: %s\n", argv[2]);
- exit(0);
+ exit(1);
}
#ifndef USE_GD_1_6
gdImageGif(img, stream);
More information about the mapserver-commits
mailing list