~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Monty Taylor
  • Date: 2008-12-02 08:56:16 UTC
  • mfrom: (629.5.6 remove-strmake)
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: mordred@solanthus.local-20081202085616-k1dvv8fly0jt70ho
MergedĀ fromĀ Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1846
1846
  {
1847
1847
    struct tm tm_tmp;
1848
1848
    localtime_r(&server_start_time,&tm_tmp);
1849
 
    strmake(system_time_zone, tzname[tm_tmp.tm_isdst != 0 ? 1 : 0],
 
1849
    strncpy(system_time_zone, tzname[tm_tmp.tm_isdst != 0 ? 1 : 0],
1850
1850
            sizeof(system_time_zone)-1);
1851
1851
 
1852
1852
 }
1869
1869
 
1870
1870
  if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)
1871
1871
  {
1872
 
    strmake(glob_hostname, STRING_WITH_LEN("localhost"));
 
1872
    strncpy(glob_hostname, STRING_WITH_LEN("localhost"));
1873
1873
    sql_print_warning(_("gethostname failed, using '%s' as hostname"),
1874
1874
                      glob_hostname);
1875
 
    strmake(pidfile_name, STRING_WITH_LEN("mysql"));
 
1875
    strncpy(pidfile_name, STRING_WITH_LEN("mysql"));
1876
1876
  }
1877
1877
  else
1878
 
  strmake(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);
 
1878
    strncpy(pidfile_name, glob_hostname, sizeof(pidfile_name)-5);
1879
1879
  my_stpcpy(fn_ext(pidfile_name),".pid");               // Add proper extension
1880
1880
 
1881
1881
  /*
3973
3973
  multi_keycache_init();
3974
3974
 
3975
3975
  /* Set directory paths */
3976
 
  strmake(language, LANGUAGE, sizeof(language)-1);
3977
 
  strmake(drizzle_real_data_home, get_relative_path(DATADIR),
3978
 
          sizeof(drizzle_real_data_home)-1);
 
3976
  strncpy(language, LANGUAGE, sizeof(language)-1);
 
3977
  strncpy(drizzle_real_data_home, get_relative_path(DATADIR),
 
3978
          sizeof(drizzle_real_data_home)-1);
3979
3979
  drizzle_data_home_buff[0]=FN_CURLIB;  // all paths are relative from here
3980
3980
  drizzle_data_home_buff[1]=0;
3981
3981
  drizzle_data_home_len= 2;
4023
4023
  const char *tmpenv;
4024
4024
  if (!(tmpenv = getenv("MY_BASEDIR_VERSION")))
4025
4025
    tmpenv = DEFAULT_DRIZZLE_HOME;
4026
 
  (void) strmake(drizzle_home, tmpenv, sizeof(drizzle_home)-1);
 
4026
  (void) strncpy(drizzle_home, tmpenv, sizeof(drizzle_home)-1);
4027
4027
}
4028
4028
 
4029
4029
 
4040
4040
    global_system_variables.tx_isolation= ISO_SERIALIZABLE;
4041
4041
    break;
4042
4042
  case 'b':
4043
 
    strmake(drizzle_home,argument,sizeof(drizzle_home)-1);
 
4043
    strncpy(drizzle_home,argument,sizeof(drizzle_home)-1);
4044
4044
    break;
4045
4045
  case 'C':
4046
4046
    if (default_collation_name == compiled_default_collation_name)
4047
4047
      default_collation_name= 0;
4048
4048
    break;
4049
4049
  case 'h':
4050
 
    strmake(drizzle_real_data_home,argument, sizeof(drizzle_real_data_home)-1);
 
4050
    strncpy(drizzle_real_data_home,argument, sizeof(drizzle_real_data_home)-1);
4051
4051
    /* Correct pointer set by my_getopt (for embedded library) */
4052
4052
    drizzle_data_home= drizzle_real_data_home;
4053
4053
    drizzle_data_home_len= strlen(drizzle_data_home);
4061
4061
                        argument, drizzled_user);
4062
4062
    break;
4063
4063
  case 'L':
4064
 
    strmake(language, argument, sizeof(language)-1);
 
4064
    strncpy(language, argument, sizeof(language)-1);
4065
4065
    break;
4066
4066
  case OPT_SLAVE_SKIP_ERRORS:
4067
4067
    init_slave_skip_errors(argument);
4124
4124
    }
4125
4125
    break;
4126
4126
  case (int) OPT_PID_FILE:
4127
 
    strmake(pidfile_name, argument, sizeof(pidfile_name)-1);
 
4127
    strncpy(pidfile_name, argument, sizeof(pidfile_name)-1);
4128
4128
    break;
4129
4129
  case OPT_CONSOLE:
4130
4130
    if (opt_console)
4154
4154
    }
4155
4155
    break;
4156
4156
  case OPT_CHARSETS_DIR:
4157
 
    strmake(drizzle_charsets_dir, argument, sizeof(drizzle_charsets_dir)-1);
 
4157
    strncpy(drizzle_charsets_dir, argument, sizeof(drizzle_charsets_dir)-1);
4158
4158
    charsets_dir = drizzle_charsets_dir;
4159
4159
    break;
4160
4160
  case OPT_TX_ISOLATION: