[openib-general] [PATCHv2] OpenSM: Change filename from subnet.lst to osm-subnet.lst

[Hal Rosenstock]

OpenSM: Change filename from subnet.lst to osm-subnet.lst

Default temp directory for non Windows platforms was previously changed
from /tmp to /var/log.

A similar change is needed to ibutils

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

Index: opensm/osm_state_mgr.c
===================================================================
--- opensm/osm_state_mgr.c	(revision 10180)
+++ opensm/osm_state_mgr.c	(working copy)
@@ -34,7 +34,6 @@
  * $Id$
  */
 
-
 /*
  * Abstract:
  *    Implementation of osm_state_mgr_t.
@@ -70,6 +69,8 @@
 #include <opensm/osm_sm_state_mgr.h>
 #include <opensm/osm_opensm.h>
 
+#define SUBNET_LIST_FILENAME "/osm-subnet.lst"
+
 osm_signal_t osm_qos_setup(IN osm_opensm_t * p_osm);
 
 /**********************************************************************
@@ -1082,12 +1083,13 @@ __osm_topology_file_create(
    CL_PLOCK_ACQUIRE( p_mgr->p_lock );
 
    file_name =
-      ( char * )malloc( strlen( p_mgr->p_subn->opt.dump_files_dir ) + 12 );
+      ( char * )malloc( strlen( p_mgr->p_subn->opt.dump_files_dir )
+                        + strlen(SUBNET_LIST_FILENAME) + 1 );
 
    CL_ASSERT( file_name );
 
    strcpy( file_name, p_mgr->p_subn->opt.dump_files_dir );
-   strcat( file_name, "/subnet.lst" );
+   strcat( file_name, SUBNET_LIST_FILENAME );
 
    if( ( rc = fopen( file_name, "w" ) ) == NULL )
    {
Index: include/opensm/osm_base.h
===================================================================
--- include/opensm/osm_base.h	(revision 10180)
+++ include/opensm/osm_base.h	(working copy)
@@ -177,7 +177,7 @@ BEGIN_C_DECLS
 *
 * DESCRIPTION
 *	Specifies the default temporary directory for the log file,
-*  subnet.lst, and other log files.
+*  osm-subnet.lst, and other log files.
 *
 * SYNOPSIS
 */
Index: man/opensm.8
===================================================================
--- man/opensm.8	(revision 10180)
+++ man/opensm.8	(working copy)
@@ -1,4 +1,4 @@
-.TH OPENSM 8 "November 22, 2006" "OpenIB" "OpenIB Management"
+.TH OPENSM 8 "November 28, 2006" "OpenIB" "OpenIB Management"
 
 .SH NAME
 opensm \- InfiniBand subnet manager and administration (SM/SA) 
@@ -233,7 +233,7 @@ Display this usage info then exit.
 The following environment variables control opensm behavior:
 
 OSM_TMP_DIR - controls the directory in which the temporary files generated by 
-opensm are created. These files are: subnet.lst, osm.fdbs and osm.mcfdbs.
+opensm are created. These files are: osm-subnet.lst, osm.fdbs, and osm.mcfdbs.
 By default, this directory is /tmp.
 
 OSM_CACHE_DIR - opensm stores certain data to the disk such that subsequent